diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9e815c35..8f841f59 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -17,9 +17,9 @@ jobs:
     needs:
     - sanity-check
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     container:
-      image: "ubuntu:24.04"
+      image: "ubuntu:26.04"
     env:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
     steps:
@@ -30,7 +30,7 @@ jobs:
         run: |
             sudo apt install --yes git
 
-            sudo DEBIAN_FRONTEND=noninteractive apt install --yes dotnet8
+            sudo DEBIAN_FRONTEND=noninteractive apt install --yes dotnet10
 
       # workaround for https://github.com/actions/runner/issues/2033
       - name: ownership workaround
@@ -41,16 +41,12 @@ jobs:
 
   sanity-check:
     needs:
-    - macOS--dotnet8-and-mono
-    - macOS--mono
-    - linux-newLTS-github--dotnet-and-newmono
-    - linux-newLTS-vanilla--stockmono
-    - linux-newLTS-vanilla--newmono
-    - linux-newLTS-vanilla--dotnet8
-    - windows--legacyFramework
-    - windows--dotnet8
+    - macOS--dotnet10-and-mono
+    - linux-oldLTS-github--dotnet-and-newmono
+    - linux-newLTS-vanilla--dotnet10
+    - windows--dotnet10
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
       with:
@@ -74,10 +70,10 @@ jobs:
       if: github.event_name == 'pull_request'
       run: ./conventions/commitlint.sh --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose
 
-    - name: Setup .NET SDK 8.0.x
+    - name: Setup .NET SDK 10.0.x
       uses: actions/setup-dotnet@v1.7.2
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: fantomless
       run: |
         dotnet new tool-manifest
@@ -85,16 +81,16 @@ jobs:
         dotnet fantomless --recurse .
         git diff --exit-code
 
-  macOS--dotnet8-and-mono:
+  macOS--dotnet10-and-mono:
     runs-on: macOS-14
     steps:
     - uses: actions/checkout@v1
     - name: check mono version
       run: mono --version
-    - name: Setup .NET SDK 8.0.x
+    - name: Setup .NET SDK 10.0.x
       uses: actions/setup-dotnet@v1.7.2
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: configure
       run: ./configure.sh
     - name: build in DEBUG mode
@@ -116,36 +112,7 @@ jobs:
     - name: compile this repo's .fsx scripts with fsx
       run: ./compileFSharpScripts.fsx
 
-  macOS--mono:
-    runs-on: macOS-14
-    steps:
-    - uses: actions/checkout@v1
-    - name: HACK to emulate dotnet uninstall
-      run: sudo rm -f `which dotnet`
-    - name: check mono version
-      run: mono --version
-    - name: configure
-      run: ./configure.sh
-    - name: build in DEBUG mode
-      run: make
-    - name: run unit tests
-      run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
-
-    - name: install
-      run: |
-        # to clean Debug artifacts first (make install builds in Release config)
-        git clean -fdx
-
-        ./configure.sh
-        make release
-        sudo make install
-
-    - name: run tests
-      run: make check
-    - name: compile this repo's .fsx scripts with fsx
-      run: ./compileFSharpScripts.fsx
-
-  linux-newLTS-github--dotnet-and-newmono:
+  linux-oldLTS-github--dotnet-and-newmono:
     runs-on: ubuntu-24.04
     env:
       DOTNET_ROLL_FORWARD: major
@@ -176,102 +143,16 @@ jobs:
     - name: compile this repo's .fsx scripts with fsx
       run: ./compileFSharpScripts.fsx
 
-  linux-newLTS-vanilla--stockmono:
-    runs-on: ubuntu-24.04
-    container:
-      image: "ubuntu:24.04"
-    steps:
-    - uses: actions/checkout@v1
-    - name: install sudo
-      run: apt update && apt install --yes sudo
-    - name: install all dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
-
-    # workaround for https://github.com/actions/runner/issues/2033
-    - name: ownership workaround
-      run: git config --global --add safe.directory '*'
-
-    - name: check mono version
-      run: mono --version
-    - name: install dependencies
-      run: sudo apt install --yes fsharp
-    - name: check mono version
-      run: mono --version
-    - name: configure
-      run: ./configure.sh
-    - name: build in DEBUG mode
-      run: make
-
-    - name: install
-      run: |
-        # to clean Debug artifacts first (make install builds in Release config)
-        git clean -fdx
-
-        ./configure.sh
-        make release
-        sudo make install
-
-    - name: run unit tests
-      run: ./scripts/runUnitTests.fsx
-    - name: run tests
-      run: make check
-    - name: compile this repo's .fsx scripts with fsx
-      run: ./compileFSharpScripts.fsx
-
-  linux-newLTS-vanilla--newmono:
-    runs-on: ubuntu-24.04
-    container:
-      image: "ubuntu:24.04"
-    steps:
-    - uses: actions/checkout@v1
-    - name: install sudo
-      run: apt update && apt install --yes sudo
-    - name: install last version of mono (Microsoft APT repositories)
-      run: sudo ./scripts/CI/install_mono_from_microsoft_deb_packages.sh
-    - name: install rest of dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
-
-    # workaround for https://github.com/actions/runner/issues/2033
-    - name: ownership workaround
-      run: git config --global --add safe.directory '*'
-
-    - name: check mono version
-      run: mono --version
-    - name: install dependencies
-      run: sudo apt install --yes fsharp
-    - name: check mono version
-      run: mono --version
-    - name: configure
-      run: ./configure.sh
-    - name: build in DEBUG mode
-      run: make
-    - name: run unit tests
-      run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
-
-    - name: install
-      run: |
-        # to clean Debug artifacts first (make install builds in Release config)
-        git clean -fdx
-
-        ./configure.sh
-        make release
-        sudo make install
-
-    - name: run tests
-      run: make check
-    - name: compile this repo's .fsx scripts with fsx
-      run: ./compileFSharpScripts.fsx
-
-  linux-newLTS-vanilla--dotnet8:
-    runs-on: ubuntu-24.04
+  linux-newLTS-vanilla--dotnet10:
+    runs-on: ubuntu-latest
     container:
-      image: "ubuntu:24.04"
+      image: "ubuntu:26.04"
     steps:
     - uses: actions/checkout@v1
     - name: install sudo
       run: apt update && apt install --yes sudo
     - name: install dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet8
+      run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet10
 
     # workaround for https://github.com/actions/runner/issues/2033
     - name: ownership workaround
@@ -300,38 +181,14 @@ jobs:
     - name: compile this repo's .fsx scripts with fsx
       run: ./compileFSharpScripts.fsx
 
-  windows--legacyFramework:
-    runs-on: windows-2022
-    steps:
-    - uses: actions/checkout@v1
-    - name: HACK to emulate dotnet uninstall
-      run: del $(where.exe dotnet)
-    - name: build in DEBUG mode
-      run: .\make.bat
-    - name: run unit tests
-      run: .\Tools\fsi.bat scripts\runUnitTests.fsx
-
-    - name: install
-      run: |
-        # to clean Debug artifacts first (make install builds in Release config)
-        git clean -fdx
-
-        .\make.bat release
-        .\make.bat install
-
-    - name: run tests
-      run: .\make.bat check
-    - name: compile this repo's .fsx scripts with fsx
-      run: .\Tools\fsi.bat compileFSharpScripts.fsx
-
-  windows--dotnet8:
+  windows--dotnet10:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Setup .NET SDK 8.0.x
+    - name: Setup .NET SDK 10.0.x
       uses: actions/setup-dotnet@v1.7.2
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: build in DEBUG mode
       run: .\make.bat
     - name: run unit tests
diff --git a/ReadMe.md b/ReadMe.md
index e89627d7..0aecafe3 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -2,7 +2,7 @@
 
 ## PUBLIC SERVICE ANNOUNCEMENT
 
-THIS REPO IS FACING A COMPLETE OVERHAUL/REVAMP/RENOVATION IN ORDER TO SUPPORT .NET8.
+THIS REPO IS FACING A COMPLETE OVERHAUL/REVAMP/RENOVATION IN ORDER TO SUPPORT .NET10.
 
 Unfinished tasks so far:
 * Revamp this ReadMe.md file to remove any mentions to Mono or the legacy .NET4.x framework.
diff --git a/Tools/bump.fsx b/Tools/bump.fsx
index 20b530b3..f4a4a539 100755
--- a/Tools/bump.fsx
+++ b/Tools/bump.fsx
@@ -6,8 +6,8 @@ open System.IO
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
 
 open Fsdk
 open Fsdk.Process
@@ -119,7 +119,7 @@ let GitCommit (fullVersion: Version) (newFullVersion: Version) =
         .Execute(
             {
                 Command = "git"
-                Arguments = "add Fsdk/AssemblyInfo.fs"
+                Arguments = "add src/Fsdk/AssemblyInfo.fs"
             },
             Echo.Off
         )
diff --git a/Tools/clean.fsx b/Tools/clean.fsx
index c29d76fc..8dddf685 100755
--- a/Tools/clean.fsx
+++ b/Tools/clean.fsx
@@ -6,7 +6,7 @@ open System.IO
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
+#load "../src/Fsdk/Misc.fs"
 open Fsdk
 
 let args = Misc.FsxOnlyArguments()
diff --git a/Tools/nugetPush.fsx b/Tools/nugetPush.fsx
index 5ee197c9..6aa66a96 100755
--- a/Tools/nugetPush.fsx
+++ b/Tools/nugetPush.fsx
@@ -7,10 +7,10 @@ open System.Linq
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
-#load "../Fsdk/Git.fs"
-#load "../Fsdk/Network.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
+#load "../src/Fsdk/Git.fs"
+#load "../src/Fsdk/Network.fs"
 
 open Fsdk
 open Fsdk.Process
diff --git a/Tools/rename.fsx b/Tools/rename.fsx
index 94d3db7f..8f9376bb 100755
--- a/Tools/rename.fsx
+++ b/Tools/rename.fsx
@@ -4,11 +4,11 @@ open System
 open System.IO
 
 #if LEGACY_FRAMEWORK
-Console.Error.WriteLine "This script is only compatible with .NET8 or higher"
+Console.Error.WriteLine "This script is only compatible with .NET10 or higher"
 Environment.Exit 1
 #else
 
-#load "../Fsdk/Misc.fs"
+#load "../src/Fsdk/Misc.fs"
 open Fsdk
 
 let args = Misc.FsxOnlyArguments()
diff --git a/Tools/safeRun.fsx b/Tools/safeRun.fsx
index 51543074..b32d609c 100755
--- a/Tools/safeRun.fsx
+++ b/Tools/safeRun.fsx
@@ -12,11 +12,11 @@ let NUMBER_OF_LINES_OF_BUFFER_TO_SHOW_IN_NOTIFICATION = 20
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
-#load "../Fsdk/Unix.fs"
-#load "../Fsdk/Git.fs"
-#load "../Fsdk/Network.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
+#load "../src/Fsdk/Unix.fs"
+#load "../src/Fsdk/Git.fs"
+#load "../src/Fsdk/Network.fs"
 
 open Fsdk
 
diff --git a/compileFSharpScripts.fsx b/compileFSharpScripts.fsx
index 4d6f6712..16bf4c22 100755
--- a/compileFSharpScripts.fsx
+++ b/compileFSharpScripts.fsx
@@ -7,8 +7,8 @@ open System.Linq
 #r "System.Configuration"
 open System.Configuration
 
-#load "Fsdk/Misc.fs"
-#load "Fsdk/Process.fs"
+#load "src/Fsdk/Misc.fs"
+#load "src/Fsdk/Process.fs"
 
 open Fsdk
 open Fsdk.Process
@@ -23,7 +23,7 @@ let rec FindFsxc(nestedCall: bool) : bool * FileInfo =
     let fsxCompiler = "fsxc.exe"
 #endif
 
-    let fsxcBinDir = Path.Combine(__SOURCE_DIRECTORY__, "fsxc", "bin")
+    let fsxcBinDir = Path.Combine(__SOURCE_DIRECTORY__, "src", "fsxc", "bin")
 
     let findFsxcExeFiles() =
         Directory.GetFiles(fsxcBinDir, fsxCompiler, SearchOption.AllDirectories)
diff --git a/fsx-legacy.sln b/fsx-legacy.sln
index 009ca847..8c8cd527 100644
--- a/fsx-legacy.sln
+++ b/fsx-legacy.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsdk", "Fsdk\Fsdk-legacy.fsproj", "{4634F264-784E-42DA-B5A1-FE72125DEAFC}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsdk", "src\Fsdk\Fsdk-legacy.fsproj", "{4634F264-784E-42DA-B5A1-FE72125DEAFC}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "fsxc\fsxc-legacy.fsproj", "{56DA5F03-8F7F-44AB-B692-5A24DB134A8B}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "src\fsxc\fsxc-legacy.fsproj", "{56DA5F03-8F7F-44AB-B692-5A24DB134A8B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{8E1108BE-590F-4C6D-8496-A8AAEB8594D8}"
 	ProjectSection(SolutionItems) = preProject
@@ -51,8 +51,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DBAE02AB
 		scripts\fsx.bat = scripts\fsx.bat
 	EndProjectSection
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsdk.Tests", "Fsdk.Tests\Fsdk.Tests-legacy.fsproj", "{43BA7E25-975B-4DF9-B274-EEF6C806C1D0}"
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsx", "fsx\fsx-legacy.fsproj", "{14E47DE0-49B3-4B58-9627-8C3F10A21D24}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsdk.Tests", "src\Fsdk.Tests\Fsdk.Tests-legacy.fsproj", "{43BA7E25-975B-4DF9-B274-EEF6C806C1D0}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsx", "src\fsx\fsx-legacy.fsproj", "{14E47DE0-49B3-4B58-9627-8C3F10A21D24}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/fsx.sln b/fsx.sln
index 5be54513..a2a92505 100644
--- a/fsx.sln
+++ b/fsx.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 25.0.1703.8
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "fsxc\fsxc.fsproj", "{9E754152-E69A-4DB9-B23A-3B72C189FF5A}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsxc", "src\fsxc\fsxc.fsproj", "{9E754152-E69A-4DB9-B23A-3B72C189FF5A}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsdk", "Fsdk\Fsdk.fsproj", "{B532D664-2864-4532-9673-3E52DD363BB9}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsdk", "src\Fsdk\Fsdk.fsproj", "{B532D664-2864-4532-9673-3E52DD363BB9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{17C46E45-4C73-4981-9EE4-686675C2DDBB}"
 	ProjectSection(SolutionItems) = preProject
@@ -52,8 +52,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{FD764CDA
 		Tools\safeRun.fsx = Tools\safeRun.fsx
 	EndProjectSection
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fsdk.Tests", "Fsdk.Tests\Fsdk.Tests.fsproj", "{43BA7E25-975B-4DF9-B274-EEF6C806C1D0}"
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsx", "fsx\fsx.fsproj", "{534A9824-CD0A-47FC-AEF0-9A5F04021507}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fsdk.Tests", "src\Fsdk.Tests\Fsdk.Tests.fsproj", "{43BA7E25-975B-4DF9-B274-EEF6C806C1D0}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "fsx", "src\fsx\fsx.fsproj", "{534A9824-CD0A-47FC-AEF0-9A5F04021507}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/scripts/install.sh b/scripts/install.sh
index 4e634842..eafdceaa 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -10,9 +10,9 @@ mkdir -p $FSX_INSTALL_DIR
 mkdir -p $BIN_INSTALL_DIR
 
 if [[ x"$Solution" == "xfsx.sln" ]]; then
-    cp -rfvp ./fsxc/bin/Release/net8.0/* $FSX_INSTALL_DIR
+    cp -rfvp ./src/fsxc/bin/Release/net10.0/* $FSX_INSTALL_DIR
 else
-    cp -rfvp ./fsxc/bin/Release/* $FSX_INSTALL_DIR
+    cp -rfvp ./src/fsxc/bin/Release/* $FSX_INSTALL_DIR
 fi
 cp -v ./scripts/launcher.sh "$BIN_INSTALL_DIR/fsx"
 chmod ugo+x "$BIN_INSTALL_DIR/fsx"
diff --git a/scripts/make.fsx b/scripts/make.fsx
index 70c657f7..f5bf5d5b 100644
--- a/scripts/make.fsx
+++ b/scripts/make.fsx
@@ -7,10 +7,10 @@ open System.Diagnostics
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
-#load "../Fsdk/Git.fs"
-#load "../Fsdk/Network.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
+#load "../src/Fsdk/Git.fs"
+#load "../src/Fsdk/Network.fs"
 
 open Fsdk
 open Fsdk.Process
@@ -19,7 +19,7 @@ let ScriptsDir = __SOURCE_DIRECTORY__ |> DirectoryInfo
 let RootDir = Path.Combine(ScriptsDir.FullName, "..") |> DirectoryInfo
 let TestDir = Path.Combine(RootDir.FullName, "test") |> DirectoryInfo
 let ToolsDir = Path.Combine(RootDir.FullName, "Tools") |> DirectoryInfo
-let FsdkDir = Path.Combine(RootDir.FullName, "Fsdk") |> DirectoryInfo
+let FsdkDir = Path.Combine(RootDir.FullName, "src", "Fsdk") |> DirectoryInfo
 let NugetDir = Path.Combine(RootDir.FullName, ".nuget") |> DirectoryInfo
 let NugetExe = Path.Combine(NugetDir.FullName, "nuget.exe") |> FileInfo
 
@@ -49,13 +49,20 @@ let mainBinariesDir binaryConfig =
 #if !LEGACY_FRAMEWORK
     Path.Combine(
         RootDir.FullName,
+        "src",
         "fsxc",
         "bin",
         binaryConfig.ToString(),
-        "net8.0"
+        "net10.0"
     )
 #else
-    Path.Combine(RootDir.FullName, "fsxc", "bin", binaryConfig.ToString())
+    Path.Combine(
+        RootDir.FullName,
+        "src",
+        "fsxc",
+        "bin",
+        binaryConfig.ToString()
+    )
 #endif
     |> DirectoryInfo
 
@@ -209,10 +216,11 @@ let assemblyExecutableExtension =
     "exe"
 #endif
 
-let releaseFolderPath = Path.Combine(RootDir.FullName, "fsx", "bin", "Release")
+let releaseFolderPath =
+    Path.Combine(RootDir.FullName, "src", "fsx", "bin", "Release")
 
 #if !LEGACY_FRAMEWORK
-let finalReleaseFolderPath = Path.Combine(releaseFolderPath, "net8.0")
+let finalReleaseFolderPath = Path.Combine(releaseFolderPath, "net10.0")
 #else
 let finalReleaseFolderPath = releaseFolderPath
 #endif
diff --git a/scripts/publish.fsx b/scripts/publish.fsx
index b6e6defc..81d1942d 100644
--- a/scripts/publish.fsx
+++ b/scripts/publish.fsx
@@ -4,10 +4,10 @@ open System.IO
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
-#load "../Fsdk/Git.fs"
-#load "../Fsdk/Network.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
+#load "../src/Fsdk/Git.fs"
+#load "../src/Fsdk/Network.fs"
 
 open Fsdk
 open Fsdk.Process
@@ -85,7 +85,7 @@ let Pack proj =
                 Command = "dotnet"
                 Arguments =
                     sprintf
-                        "pack %s/%s.fsproj -property:PackageVersion=%s"
+                        "pack src/%s/%s.fsproj -property:PackageVersion=%s"
                         proj
                         proj
                         fullVersion
@@ -144,7 +144,7 @@ match githubEventName with
                     Command = "dotnet"
                     Arguments =
                         sprintf
-                            "nuget push %s/nupkg/%s.%s.nupkg --api-key %s --source %s"
+                            "nuget push src/%s/nupkg/%s.%s.nupkg --api-key %s --source %s"
                             proj
                             proj
                             fullVersion
diff --git a/scripts/runTests.fsx b/scripts/runTests.fsx
index 57275232..4691c919 100755
--- a/scripts/runTests.fsx
+++ b/scripts/runTests.fsx
@@ -9,10 +9,10 @@ open System.Diagnostics
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
-#load "../Fsdk/Git.fs"
-#load "../Fsdk/Network.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
+#load "../src/Fsdk/Git.fs"
+#load "../src/Fsdk/Network.fs"
 
 open Fsdk
 open Fsdk.Process
diff --git a/scripts/runUnitTests.fsx b/scripts/runUnitTests.fsx
index eb5d02af..e34ca600 100755
--- a/scripts/runUnitTests.fsx
+++ b/scripts/runUnitTests.fsx
@@ -11,10 +11,10 @@ open System.Diagnostics
 open System.Configuration
 #endif
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
-#load "../Fsdk/Git.fs"
-#load "../Fsdk/Network.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
+#load "../src/Fsdk/Git.fs"
+#load "../src/Fsdk/Network.fs"
 
 open Fsdk
 open Fsdk.Process
@@ -50,6 +50,7 @@ let RunUnitTests() =
     let testTarget =
         Path.Combine(
             RootDir.FullName,
+            "src",
             testProjectName,
             testProjectName + ".fsproj"
         )
@@ -61,6 +62,7 @@ let RunUnitTests() =
     let testTargetDebug =
         Path.Combine(
             RootDir.FullName,
+            "src",
             testProjectName,
             "bin",
             "Debug",
@@ -71,6 +73,7 @@ let RunUnitTests() =
     let testTargetRelease =
         Path.Combine(
             RootDir.FullName,
+            "src",
             testProjectName,
             "bin",
             "Release",
diff --git a/Fsdk.Tests/AsyncCancellation.fs b/src/Fsdk.Tests/AsyncCancellation.fs
similarity index 100%
rename from Fsdk.Tests/AsyncCancellation.fs
rename to src/Fsdk.Tests/AsyncCancellation.fs
diff --git a/Fsdk.Tests/AsyncExtensions.fs b/src/Fsdk.Tests/AsyncExtensions.fs
similarity index 100%
rename from Fsdk.Tests/AsyncExtensions.fs
rename to src/Fsdk.Tests/AsyncExtensions.fs
diff --git a/Fsdk.Tests/FSharpUtil.fs b/src/Fsdk.Tests/FSharpUtil.fs
similarity index 100%
rename from Fsdk.Tests/FSharpUtil.fs
rename to src/Fsdk.Tests/FSharpUtil.fs
diff --git a/Fsdk.Tests/Fsdk.Tests-legacy.fsproj b/src/Fsdk.Tests/Fsdk.Tests-legacy.fsproj
similarity index 98%
rename from Fsdk.Tests/Fsdk.Tests-legacy.fsproj
rename to src/Fsdk.Tests/Fsdk.Tests-legacy.fsproj
index 33ebcd3d..a6eda494 100644
--- a/Fsdk.Tests/Fsdk.Tests-legacy.fsproj
+++ b/src/Fsdk.Tests/Fsdk.Tests-legacy.fsproj
@@ -53,7 +53,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Fsdk\Fsdk-legacy.fsproj" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps-legacy.proj" />
+  <Import Project="..\..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
diff --git a/Fsdk.Tests/Fsdk.Tests.fsproj b/src/Fsdk.Tests/Fsdk.Tests.fsproj
similarity index 74%
rename from Fsdk.Tests/Fsdk.Tests.fsproj
rename to src/Fsdk.Tests/Fsdk.Tests.fsproj
index 154e96b3..58a4f303 100644
--- a/Fsdk.Tests/Fsdk.Tests.fsproj
+++ b/src/Fsdk.Tests/Fsdk.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
@@ -16,11 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Fsdk.Tests/Program.fs b/src/Fsdk.Tests/Program.fs
similarity index 100%
rename from Fsdk.Tests/Program.fs
rename to src/Fsdk.Tests/Program.fs
diff --git a/Fsdk.Tests/Tsv.fs b/src/Fsdk.Tests/Tsv.fs
similarity index 100%
rename from Fsdk.Tests/Tsv.fs
rename to src/Fsdk.Tests/Tsv.fs
diff --git a/Fsdk.Tests/packages.config b/src/Fsdk.Tests/packages.config
similarity index 100%
rename from Fsdk.Tests/packages.config
rename to src/Fsdk.Tests/packages.config
diff --git a/Fsdk/AssemblyInfo.fs b/src/Fsdk/AssemblyInfo.fs
similarity index 100%
rename from Fsdk/AssemblyInfo.fs
rename to src/Fsdk/AssemblyInfo.fs
diff --git a/Fsdk/FSharpUtil.fs b/src/Fsdk/FSharpUtil.fs
similarity index 100%
rename from Fsdk/FSharpUtil.fs
rename to src/Fsdk/FSharpUtil.fs
diff --git a/Fsdk/Fsdk-legacy.fsproj b/src/Fsdk/Fsdk-legacy.fsproj
similarity index 98%
rename from Fsdk/Fsdk-legacy.fsproj
rename to src/Fsdk/Fsdk-legacy.fsproj
index 9182e28c..0b0512ff 100644
--- a/Fsdk/Fsdk-legacy.fsproj
+++ b/src/Fsdk/Fsdk-legacy.fsproj
@@ -59,7 +59,7 @@
     <Compile Include="Network.fs" />
     <Compile Include="Taiga.fs" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps-legacy.proj" />
+  <Import Project="..\..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
diff --git a/Fsdk/Fsdk.fsproj b/src/Fsdk/Fsdk.fsproj
similarity index 92%
rename from Fsdk/Fsdk.fsproj
rename to src/Fsdk/Fsdk.fsproj
index 480569cd..ecd7acdc 100644
--- a/Fsdk/Fsdk.fsproj
+++ b/src/Fsdk/Fsdk.fsproj
@@ -32,14 +32,14 @@
 
   <ItemGroup>
     <Content
-      Include="..\LICENCE.txt"
+      Include="..\..\LICENCE.txt"
       Link="LICENCE.txt"
       Pack="true"
       PackagePath="LICENCE.txt"
       />
 
     <Content
-      Include="..\ReadMe.md"
+      Include="..\..\ReadMe.md"
       Link="ReadMe.md"
       Pack="true"
       PackagePath="ReadMe.md"
diff --git a/Fsdk/Git.fs b/src/Fsdk/Git.fs
similarity index 100%
rename from Fsdk/Git.fs
rename to src/Fsdk/Git.fs
diff --git a/Fsdk/Misc.fs b/src/Fsdk/Misc.fs
similarity index 100%
rename from Fsdk/Misc.fs
rename to src/Fsdk/Misc.fs
diff --git a/Fsdk/Network.fs b/src/Fsdk/Network.fs
similarity index 99%
rename from Fsdk/Network.fs
rename to src/Fsdk/Network.fs
index 3d893db6..4c5e432d 100644
--- a/Fsdk/Network.fs
+++ b/src/Fsdk/Network.fs
@@ -243,10 +243,12 @@ module Network =
     let private DownloadFileIgnoringSslCertificates
         (uri: Uri)
         : Async<FileInfo> =
+#if LEGACY_FRAMEWORK
         ServicePointManager.ServerCertificateValidationCallback <-
             System.Net.Security.RemoteCertificateValidationCallback(fun _ _ _ _ ->
                 true
             )
+#endif
 
         async {
             try
@@ -491,7 +493,7 @@ module Network =
 
 #if !LEGACY_FRAMEWORK
         Console.Error.WriteLine
-            "WARNING: using nuget.exe is deprecated when using .NET8 or newer, consider using dotnet restore instead"
+            "WARNING: using nuget.exe is deprecated when using .NET10 or newer, consider using dotnet restore instead"
 #endif
 
         let cmd = CreateNugetCommand nugetExe command
diff --git a/Fsdk/Process.fs b/src/Fsdk/Process.fs
similarity index 100%
rename from Fsdk/Process.fs
rename to src/Fsdk/Process.fs
diff --git a/Fsdk/Taiga.fs b/src/Fsdk/Taiga.fs
similarity index 100%
rename from Fsdk/Taiga.fs
rename to src/Fsdk/Taiga.fs
diff --git a/Fsdk/Unix.fs b/src/Fsdk/Unix.fs
similarity index 100%
rename from Fsdk/Unix.fs
rename to src/Fsdk/Unix.fs
diff --git a/Fsdk/packages.config b/src/Fsdk/packages.config
similarity index 100%
rename from Fsdk/packages.config
rename to src/Fsdk/packages.config
diff --git a/fsx/Program.fs b/src/fsx/Program.fs
similarity index 100%
rename from fsx/Program.fs
rename to src/fsx/Program.fs
diff --git a/fsx/fsx-legacy.fsproj b/src/fsx/fsx-legacy.fsproj
similarity index 98%
rename from fsx/fsx-legacy.fsproj
rename to src/fsx/fsx-legacy.fsproj
index 3b6bced7..5e19d1ae 100644
--- a/fsx/fsx-legacy.fsproj
+++ b/src/fsx/fsx-legacy.fsproj
@@ -60,7 +60,7 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <Import Project="..\CommonBuildProps-legacy.proj" />
+  <Import Project="..\..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
diff --git a/fsx/fsx.fsproj b/src/fsx/fsx.fsproj
similarity index 90%
rename from fsx/fsx.fsproj
rename to src/fsx/fsx.fsproj
index 2bfe476e..d891a0a6 100644
--- a/fsx/fsx.fsproj
+++ b/src/fsx/fsx.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
 
     <PackAsTool>true</PackAsTool>
@@ -44,13 +44,13 @@
 
   <ItemGroup>
     <Content
-      Include="..\LICENCE.txt"
+      Include="..\..\LICENCE.txt"
       Link="LICENCE.txt"
       Pack="true"
       PackagePath="LICENCE.txt"/>
 
     <Content
-      Include="..\ReadMe.md"
+      Include="..\..\ReadMe.md"
       Link="ReadMe.md"
       Pack="true"
       PackagePath="ReadMe.md"/>
diff --git a/fsxc/AssemblyInfo.fs b/src/fsxc/AssemblyInfo.fs
similarity index 100%
rename from fsxc/AssemblyInfo.fs
rename to src/fsxc/AssemblyInfo.fs
diff --git a/fsxc/Fsxc.fs b/src/fsxc/Fsxc.fs
similarity index 99%
rename from fsxc/Fsxc.fs
rename to src/fsxc/Fsxc.fs
index 681a3c9e..fb43e16f 100644
--- a/fsxc/Fsxc.fs
+++ b/src/fsxc/Fsxc.fs
@@ -811,7 +811,7 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <!-- the two settings below allow the binaries sit directly in subfolder /bin/ -->
     <OutputPath>.</OutputPath>
diff --git a/fsxc/Program.fs b/src/fsxc/Program.fs
similarity index 100%
rename from fsxc/Program.fs
rename to src/fsxc/Program.fs
diff --git a/fsxc/fsxc-legacy.fsproj b/src/fsxc/fsxc-legacy.fsproj
similarity index 98%
rename from fsxc/fsxc-legacy.fsproj
rename to src/fsxc/fsxc-legacy.fsproj
index 6b337786..64ab6f92 100644
--- a/fsxc/fsxc-legacy.fsproj
+++ b/src/fsxc/fsxc-legacy.fsproj
@@ -61,7 +61,7 @@
     <Compile Include="Program.fs" />
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="..\CommonBuildProps-legacy.proj" />
+  <Import Project="..\..\CommonBuildProps-legacy.proj" />
   <Import Condition="'$(FSharpTargetsPath)' != ''" Project="$(FSharpTargetsPath)" />
   <Target Name="BeforeBuild">
     <Message Condition="'$(FSharpTargetsPath)' == ''" Importance="High" Text="F# SDK path was not found!" />
diff --git a/fsxc/fsxc.fsproj b/src/fsxc/fsxc.fsproj
similarity index 93%
rename from fsxc/fsxc.fsproj
rename to src/fsxc/fsxc.fsproj
index 321c1f8c..037c6dae 100644
--- a/fsxc/fsxc.fsproj
+++ b/src/fsxc/fsxc.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>fsxc</ToolCommandName>
@@ -45,13 +45,13 @@
 
   <ItemGroup>
     <Content 
-      Include="..\LICENCE.txt" 
+      Include="..\..\LICENCE.txt" 
       Link="LICENCE.txt" 
       Pack="true" 
       PackagePath="LICENCE.txt"/>
     
     <Content 
-      Include="..\ReadMe.md" 
+      Include="..\..\ReadMe.md" 
       Link="ReadMe.md" 
       Pack="true" 
       PackagePath="ReadMe.md"/>
diff --git a/fsxc/packages.config b/src/fsxc/packages.config
similarity index 100%
rename from fsxc/packages.config
rename to src/fsxc/packages.config
diff --git a/test/testProcess.fsx b/test/testProcess.fsx
index 3dc35aab..474283bf 100755
--- a/test/testProcess.fsx
+++ b/test/testProcess.fsx
@@ -6,8 +6,8 @@ open System.Linq
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
 
 open Fsdk
 open Fsdk.Process
diff --git a/test/testProcessConcurrency.fsx b/test/testProcessConcurrency.fsx
index 06fbf683..f7e4e398 100755
--- a/test/testProcessConcurrency.fsx
+++ b/test/testProcessConcurrency.fsx
@@ -5,8 +5,8 @@ open System.IO
 #r "System.Configuration"
 open System.Configuration
 
-#load "../Fsdk/Misc.fs"
-#load "../Fsdk/Process.fs"
+#load "../src/Fsdk/Misc.fs"
+#load "../src/Fsdk/Process.fs"
 
 open Fsdk
 open Fsdk.Process
diff --git a/version.config b/version.config
index 699e7e4c..01e496c5 100644
--- a/version.config
+++ b/version.config
@@ -1 +1 @@
-BaseVersion=0.7.99
+BaseVersion=0.9.99