diff --git a/.vscode/launch.json b/.vscode/launch.json
index b2b07ab..10f7811 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/bin/Debug/net10.0/FsTool.dll",
+      "program": "${workspaceFolder}/Cli/bin/Debug/net10.0/FsToolbox.Cli.dll",
       "cwd": "${workspaceFolder}",
       "console": "integratedTerminal",
       "stopAtEntry": false
diff --git a/Cli.csproj b/Cli/Cli.csproj
similarity index 100%
rename from Cli.csproj
rename to Cli/Cli.csproj
diff --git a/CustomTasks.Regions.cs b/Cli/CustomTasks.Regions.cs
similarity index 100%
rename from CustomTasks.Regions.cs
rename to Cli/CustomTasks.Regions.cs
diff --git a/CustomTasks.cs b/Cli/CustomTasks.cs
similarity index 100%
rename from CustomTasks.cs
rename to Cli/CustomTasks.cs
diff --git a/Endpoints.cs b/Cli/Endpoints.cs
similarity index 100%
rename from Endpoints.cs
rename to Cli/Endpoints.cs
diff --git a/Helper/AuthHelper.cs b/Cli/Helper/AuthHelper.cs
similarity index 100%
rename from Helper/AuthHelper.cs
rename to Cli/Helper/AuthHelper.cs
diff --git a/Helper/Settings.cs b/Cli/Helper/Settings.cs
similarity index 100%
rename from Helper/Settings.cs
rename to Cli/Helper/Settings.cs
diff --git a/Program.cs b/Cli/Program.cs
similarity index 100%
rename from Program.cs
rename to Cli/Program.cs
diff --git a/Tasks/RegionTasks.Regions.cs b/Cli/Tasks/RegionTasks.Regions.cs
similarity index 100%
rename from Tasks/RegionTasks.Regions.cs
rename to Cli/Tasks/RegionTasks.Regions.cs
diff --git a/Tasks/RegionTasks.cs b/Cli/Tasks/RegionTasks.cs
similarity index 100%
rename from Tasks/RegionTasks.cs
rename to Cli/Tasks/RegionTasks.cs
diff --git a/Tasks/StoreTasks.Regions.cs b/Cli/Tasks/StoreTasks.Regions.cs
similarity index 100%
rename from Tasks/StoreTasks.Regions.cs
rename to Cli/Tasks/StoreTasks.Regions.cs
diff --git a/Tasks/StoreTasks.cs b/Cli/Tasks/StoreTasks.cs
similarity index 100%
rename from Tasks/StoreTasks.cs
rename to Cli/Tasks/StoreTasks.cs
diff --git a/Tasks/UserTasks.cs b/Cli/Tasks/UserTasks.cs
similarity index 100%
rename from Tasks/UserTasks.cs
rename to Cli/Tasks/UserTasks.cs
diff --git a/appsettings.example.json b/Cli/appsettings.example.json
similarity index 100%
rename from appsettings.example.json
rename to Cli/appsettings.example.json
diff --git a/FsToolbox.sln b/FsToolbox.sln
index 2c2aec9..5b3eca5 100644
--- a/FsToolbox.sln
+++ b/FsToolbox.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.5.2.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli", "Cli.csproj", "{D8D12A22-90E0-56DB-D8E0-629AC330F42B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cli", "Cli/Cli.csproj", "{D8D12A22-90E0-56DB-D8E0-629AC330F42B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution