diff --git a/DotNetSolutionTools.slnx b/DotNetSolutionTools.slnx
index 7bd0b73..ff80683 100644
--- a/DotNetSolutionTools.slnx
+++ b/DotNetSolutionTools.slnx
@@ -8,8 +8,10 @@
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/DotNetSolutionTools.App/App.axaml b/src/DotNetSolutionTools.App/App.axaml
similarity index 100%
rename from DotNetSolutionTools.App/App.axaml
rename to src/DotNetSolutionTools.App/App.axaml
diff --git a/DotNetSolutionTools.App/App.axaml.cs b/src/DotNetSolutionTools.App/App.axaml.cs
similarity index 100%
rename from DotNetSolutionTools.App/App.axaml.cs
rename to src/DotNetSolutionTools.App/App.axaml.cs
diff --git a/DotNetSolutionTools.App/Assets/avalonia-logo.ico b/src/DotNetSolutionTools.App/Assets/avalonia-logo.ico
similarity index 100%
rename from DotNetSolutionTools.App/Assets/avalonia-logo.ico
rename to src/DotNetSolutionTools.App/Assets/avalonia-logo.ico
diff --git a/DotNetSolutionTools.App/DotNetSolutionTools.App.csproj b/src/DotNetSolutionTools.App/DotNetSolutionTools.App.csproj
similarity index 100%
rename from DotNetSolutionTools.App/DotNetSolutionTools.App.csproj
rename to src/DotNetSolutionTools.App/DotNetSolutionTools.App.csproj
diff --git a/DotNetSolutionTools.App/Models/LocalStateDto.cs b/src/DotNetSolutionTools.App/Models/LocalStateDto.cs
similarity index 100%
rename from DotNetSolutionTools.App/Models/LocalStateDto.cs
rename to src/DotNetSolutionTools.App/Models/LocalStateDto.cs
diff --git a/DotNetSolutionTools.App/Program.cs b/src/DotNetSolutionTools.App/Program.cs
similarity index 100%
rename from DotNetSolutionTools.App/Program.cs
rename to src/DotNetSolutionTools.App/Program.cs
diff --git a/DotNetSolutionTools.App/Services/FileService.cs b/src/DotNetSolutionTools.App/Services/FileService.cs
similarity index 100%
rename from DotNetSolutionTools.App/Services/FileService.cs
rename to src/DotNetSolutionTools.App/Services/FileService.cs
diff --git a/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs b/src/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs
rename to src/DotNetSolutionTools.App/ViewModels/MainWindowViewModel.cs
diff --git a/DotNetSolutionTools.App/Views/MainWindow.axaml b/src/DotNetSolutionTools.App/Views/MainWindow.axaml
similarity index 100%
rename from DotNetSolutionTools.App/Views/MainWindow.axaml
rename to src/DotNetSolutionTools.App/Views/MainWindow.axaml
diff --git a/DotNetSolutionTools.App/Views/MainWindow.axaml.cs b/src/DotNetSolutionTools.App/Views/MainWindow.axaml.cs
similarity index 100%
rename from DotNetSolutionTools.App/Views/MainWindow.axaml.cs
rename to src/DotNetSolutionTools.App/Views/MainWindow.axaml.cs
diff --git a/DotNetSolutionTools.App/app.manifest b/src/DotNetSolutionTools.App/app.manifest
similarity index 100%
rename from DotNetSolutionTools.App/app.manifest
rename to src/DotNetSolutionTools.App/app.manifest
diff --git a/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs b/src/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs
rename to src/DotNetSolutionTools.CLI/Commands/ClearBinObjCommand.cs
diff --git a/DotNetSolutionTools.CLI/Commands/CompareCommand.cs b/src/DotNetSolutionTools.CLI/Commands/CompareCommand.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/CompareCommand.cs
rename to src/DotNetSolutionTools.CLI/Commands/CompareCommand.cs
diff --git a/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs b/src/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs
rename to src/DotNetSolutionTools.CLI/Commands/FormatCsprojCommand.cs
diff --git a/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs b/src/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs
rename to src/DotNetSolutionTools.CLI/Commands/ImplicitUsingsCommand.cs
diff --git a/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs b/src/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs
rename to src/DotNetSolutionTools.CLI/Commands/TreatWarningsAsErrorsCommand.cs
diff --git a/DotNetSolutionTools.CLI/Commands/UpdateProjectToNet80Command.cs b/src/DotNetSolutionTools.CLI/Commands/UpdateProjectToNet80Command.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/UpdateProjectToNet80Command.cs
rename to src/DotNetSolutionTools.CLI/Commands/UpdateProjectToNet80Command.cs
diff --git a/DotNetSolutionTools.CLI/Commands/UpdateSlnToNet80Command.cs b/src/DotNetSolutionTools.CLI/Commands/UpdateSlnToNet80Command.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Commands/UpdateSlnToNet80Command.cs
rename to src/DotNetSolutionTools.CLI/Commands/UpdateSlnToNet80Command.cs
diff --git a/DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj b/src/DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj
similarity index 100%
rename from DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj
rename to src/DotNetSolutionTools.CLI/DotNetSolutionTools.CLI.csproj
diff --git a/DotNetSolutionTools.CLI/Program.cs b/src/DotNetSolutionTools.CLI/Program.cs
similarity index 100%
rename from DotNetSolutionTools.CLI/Program.cs
rename to src/DotNetSolutionTools.CLI/Program.cs
diff --git a/DotNetSolutionTools.Core/CleanFolder.cs b/src/DotNetSolutionTools.Core/CleanFolder.cs
similarity index 100%
rename from DotNetSolutionTools.Core/CleanFolder.cs
rename to src/DotNetSolutionTools.Core/CleanFolder.cs
diff --git a/DotNetSolutionTools.Core/Common/CsprojHelper.cs b/src/DotNetSolutionTools.Core/Common/CsprojHelper.cs
similarity index 100%
rename from DotNetSolutionTools.Core/Common/CsprojHelper.cs
rename to src/DotNetSolutionTools.Core/Common/CsprojHelper.cs
diff --git a/DotNetSolutionTools.Core/Common/SlnHelper.cs b/src/DotNetSolutionTools.Core/Common/SlnHelper.cs
similarity index 100%
rename from DotNetSolutionTools.Core/Common/SlnHelper.cs
rename to src/DotNetSolutionTools.Core/Common/SlnHelper.cs
diff --git a/DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj b/src/DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj
similarity index 100%
rename from DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj
rename to src/DotNetSolutionTools.Core/DotNetSolutionTools.Core.csproj
diff --git a/DotNetSolutionTools.Core/DotNetUpgrade.cs b/src/DotNetSolutionTools.Core/DotNetUpgrade.cs
similarity index 100%
rename from DotNetSolutionTools.Core/DotNetUpgrade.cs
rename to src/DotNetSolutionTools.Core/DotNetUpgrade.cs
diff --git a/DotNetSolutionTools.Core/FormatCsproj.cs b/src/DotNetSolutionTools.Core/FormatCsproj.cs
similarity index 100%
rename from DotNetSolutionTools.Core/FormatCsproj.cs
rename to src/DotNetSolutionTools.Core/FormatCsproj.cs
diff --git a/DotNetSolutionTools.Core/GenerateSln.cs b/src/DotNetSolutionTools.Core/GenerateSln.cs
similarity index 100%
rename from DotNetSolutionTools.Core/GenerateSln.cs
rename to src/DotNetSolutionTools.Core/GenerateSln.cs
diff --git a/DotNetSolutionTools.Core/ImplicitUsings.cs b/src/DotNetSolutionTools.Core/ImplicitUsings.cs
similarity index 100%
rename from DotNetSolutionTools.Core/ImplicitUsings.cs
rename to src/DotNetSolutionTools.Core/ImplicitUsings.cs
diff --git a/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs b/src/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs
similarity index 100%
rename from DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs
rename to src/DotNetSolutionTools.Core/Infrastructure/NugetLookup.cs
diff --git a/DotNetSolutionTools.Core/Models/Project.cs b/src/DotNetSolutionTools.Core/Models/Project.cs
similarity index 100%
rename from DotNetSolutionTools.Core/Models/Project.cs
rename to src/DotNetSolutionTools.Core/Models/Project.cs
diff --git a/DotNetSolutionTools.Core/PackageVersionConsistency.cs b/src/DotNetSolutionTools.Core/PackageVersionConsistency.cs
similarity index 100%
rename from DotNetSolutionTools.Core/PackageVersionConsistency.cs
rename to src/DotNetSolutionTools.Core/PackageVersionConsistency.cs
diff --git a/DotNetSolutionTools.Core/SolutionBuildOrder.cs b/src/DotNetSolutionTools.Core/SolutionBuildOrder.cs
similarity index 100%
rename from DotNetSolutionTools.Core/SolutionBuildOrder.cs
rename to src/DotNetSolutionTools.Core/SolutionBuildOrder.cs
diff --git a/DotNetSolutionTools.Core/SolutionProjectParity.cs b/src/DotNetSolutionTools.Core/SolutionProjectParity.cs
similarity index 100%
rename from DotNetSolutionTools.Core/SolutionProjectParity.cs
rename to src/DotNetSolutionTools.Core/SolutionProjectParity.cs
diff --git a/DotNetSolutionTools.Core/WarningsAsErrors.cs b/src/DotNetSolutionTools.Core/WarningsAsErrors.cs
similarity index 100%
rename from DotNetSolutionTools.Core/WarningsAsErrors.cs
rename to src/DotNetSolutionTools.Core/WarningsAsErrors.cs
diff --git a/DotNetSolutionTools.Photino/App.razor b/src/DotNetSolutionTools.Photino/App.razor
similarity index 100%
rename from DotNetSolutionTools.Photino/App.razor
rename to src/DotNetSolutionTools.Photino/App.razor
diff --git a/DotNetSolutionTools.Photino/AppThemeProvider.cs b/src/DotNetSolutionTools.Photino/AppThemeProvider.cs
similarity index 100%
rename from DotNetSolutionTools.Photino/AppThemeProvider.cs
rename to src/DotNetSolutionTools.Photino/AppThemeProvider.cs
diff --git a/DotNetSolutionTools.Photino/Components/BuildOrderDiagram.razor b/src/DotNetSolutionTools.Photino/Components/BuildOrderDiagram.razor
similarity index 100%
rename from DotNetSolutionTools.Photino/Components/BuildOrderDiagram.razor
rename to src/DotNetSolutionTools.Photino/Components/BuildOrderDiagram.razor
diff --git a/DotNetSolutionTools.Photino/DotNetSolutionTools.Photino.csproj b/src/DotNetSolutionTools.Photino/DotNetSolutionTools.Photino.csproj
similarity index 100%
rename from DotNetSolutionTools.Photino/DotNetSolutionTools.Photino.csproj
rename to src/DotNetSolutionTools.Photino/DotNetSolutionTools.Photino.csproj
diff --git a/DotNetSolutionTools.Photino/Layout/MainLayout.razor b/src/DotNetSolutionTools.Photino/Layout/MainLayout.razor
similarity index 100%
rename from DotNetSolutionTools.Photino/Layout/MainLayout.razor
rename to src/DotNetSolutionTools.Photino/Layout/MainLayout.razor
diff --git a/DotNetSolutionTools.Photino/Layout/NavMenu.razor b/src/DotNetSolutionTools.Photino/Layout/NavMenu.razor
similarity index 100%
rename from DotNetSolutionTools.Photino/Layout/NavMenu.razor
rename to src/DotNetSolutionTools.Photino/Layout/NavMenu.razor
diff --git a/DotNetSolutionTools.Photino/Models/AppState.cs b/src/DotNetSolutionTools.Photino/Models/AppState.cs
similarity index 100%
rename from DotNetSolutionTools.Photino/Models/AppState.cs
rename to src/DotNetSolutionTools.Photino/Models/AppState.cs
diff --git a/DotNetSolutionTools.Photino/Pages/Home.razor b/src/DotNetSolutionTools.Photino/Pages/Home.razor
similarity index 100%
rename from DotNetSolutionTools.Photino/Pages/Home.razor
rename to src/DotNetSolutionTools.Photino/Pages/Home.razor
diff --git a/DotNetSolutionTools.Photino/Program.cs b/src/DotNetSolutionTools.Photino/Program.cs
similarity index 100%
rename from DotNetSolutionTools.Photino/Program.cs
rename to src/DotNetSolutionTools.Photino/Program.cs
diff --git a/DotNetSolutionTools.Photino/Properties/launchSettings.json b/src/DotNetSolutionTools.Photino/Properties/launchSettings.json
similarity index 100%
rename from DotNetSolutionTools.Photino/Properties/launchSettings.json
rename to src/DotNetSolutionTools.Photino/Properties/launchSettings.json
diff --git a/DotNetSolutionTools.Photino/_Imports.razor b/src/DotNetSolutionTools.Photino/_Imports.razor
similarity index 100%
rename from DotNetSolutionTools.Photino/_Imports.razor
rename to src/DotNetSolutionTools.Photino/_Imports.razor
diff --git a/DotNetSolutionTools.Photino/favicon.ico b/src/DotNetSolutionTools.Photino/favicon.ico
similarity index 100%
rename from DotNetSolutionTools.Photino/favicon.ico
rename to src/DotNetSolutionTools.Photino/favicon.ico
diff --git a/DotNetSolutionTools.Photino/wwwroot/css/app.css b/src/DotNetSolutionTools.Photino/wwwroot/css/app.css
similarity index 100%
rename from DotNetSolutionTools.Photino/wwwroot/css/app.css
rename to src/DotNetSolutionTools.Photino/wwwroot/css/app.css
diff --git a/DotNetSolutionTools.Photino/wwwroot/index.html b/src/DotNetSolutionTools.Photino/wwwroot/index.html
similarity index 100%
rename from DotNetSolutionTools.Photino/wwwroot/index.html
rename to src/DotNetSolutionTools.Photino/wwwroot/index.html