diff --git a/.gitignore b/.gitignore
index d859cae..c38ebcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ bin/
 /infobelApi.csproj.user
 /infobelApi.csproj.user
 /infobelApi/infobelApi.json
+/TideFin.Server/TideFin.Server.csproj.user
diff --git a/TideFin.Server.csproj.user b/TideFin.Server.csproj.user
deleted file mode 100644
index dd2d54c..0000000
--- a/TideFin.Server.csproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>Container (Dockerfile)</ActiveDebugProfile>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/TideFin.Server.sln b/TideFin.Server.sln
index 120eac3..85f959f 100644
--- a/TideFin.Server.sln
+++ b/TideFin.Server.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.13.35828.75 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TideFin.Server", "TideFin.Server.csproj", "{A490AE24-F8ED-46CB-9E86-3F22468485E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TideFin.Server", "TideFin.Server\TideFin.Server.csproj", "{A490AE24-F8ED-46CB-9E86-3F22468485E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Dockerfile b/TideFin.Server/Dockerfile
similarity index 78%
rename from Dockerfile
rename to TideFin.Server/Dockerfile
index e387c74..f54caf5 100644
--- a/Dockerfile
+++ b/TideFin.Server/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine-amd64 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine-amd64 AS build-env
 WORKDIR /App
 COPY . ./
 # Restore dependencies for your application
@@ -7,7 +7,7 @@ RUN dotnet restore
 RUN dotnet publish TideFin.Server --no-restore --self-contained false -c Release -o out /p:UseAppHost=false 
 
 
-FROM git.claeyscloud.com/david/net-base:10.0.0-alpine-22
+FROM git.claeyscloud.com/david/net-base:9.0.11-alpine-22
 WORKDIR /App
 # copy build files from build-stage
 COPY --from=build-env /App/out .
diff --git a/Program.cs b/TideFin.Server/Program.cs
similarity index 100%
rename from Program.cs
rename to TideFin.Server/Program.cs
diff --git a/Properties/launchSettings.json b/TideFin.Server/Properties/launchSettings.json
similarity index 100%
rename from Properties/launchSettings.json
rename to TideFin.Server/Properties/launchSettings.json
diff --git a/TideFin.Server.csproj b/TideFin.Server/TideFin.Server.csproj
similarity index 92%
rename from TideFin.Server.csproj
rename to TideFin.Server/TideFin.Server.csproj
index 623ffaf..a08e4ec 100644
--- a/TideFin.Server.csproj
+++ b/TideFin.Server/TideFin.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>c40713b7-7556-4b39-b57c-0abf905d7931</UserSecretsId>
diff --git a/appsettings.Development.json b/TideFin.Server/appsettings.Development.json
similarity index 100%
rename from appsettings.Development.json
rename to TideFin.Server/appsettings.Development.json
diff --git a/appsettings.json b/TideFin.Server/appsettings.json
similarity index 100%
rename from appsettings.json
rename to TideFin.Server/appsettings.json