diff --git a/docs-builder.sln b/docs-builder.sln
index f5da68c18..bf98897f2 100644
--- a/docs-builder.sln
+++ b/docs-builder.sln
@@ -53,7 +53,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assembler", "assembler", "{
actions\assembler\action.yml = actions\assembler\action.yml
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Tooling", "Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj", "{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Tooling", "src\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj", "{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "validate-inbound-local", "validate-inbound-local", "{6E2ED6CC-AFC1-4E58-965D-6AEC500EBB46}"
ProjectSection(SolutionItems) = preProject
diff --git a/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs b/src/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
rename to src/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
diff --git a/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs b/src/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs
rename to src/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs
diff --git a/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs b/src/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs
rename to src/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs
diff --git a/Elastic.Documentation.Tooling/Diagnostics/Log.cs b/src/Elastic.Documentation.Tooling/Diagnostics/Log.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Diagnostics/Log.cs
rename to src/Elastic.Documentation.Tooling/Diagnostics/Log.cs
diff --git a/Elastic.Documentation.Tooling/DocumentationTooling.cs b/src/Elastic.Documentation.Tooling/DocumentationTooling.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/DocumentationTooling.cs
rename to src/Elastic.Documentation.Tooling/DocumentationTooling.cs
diff --git a/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj b/src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj
similarity index 89%
rename from Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj
rename to src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj
index ca15acba2..f87fe543f 100644
--- a/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj
+++ b/src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs b/src/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs
rename to src/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs
diff --git a/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs b/src/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs
rename to src/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs
diff --git a/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs b/src/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs
similarity index 100%
rename from Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs
rename to src/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs
diff --git a/Elastic.Documentation.Tooling/README.md b/src/Elastic.Documentation.Tooling/README.md
similarity index 100%
rename from Elastic.Documentation.Tooling/README.md
rename to src/Elastic.Documentation.Tooling/README.md
diff --git a/src/docs-assembler/docs-assembler.csproj b/src/docs-assembler/docs-assembler.csproj
index cca53fbb6..fe7df21b7 100644
--- a/src/docs-assembler/docs-assembler.csproj
+++ b/src/docs-assembler/docs-assembler.csproj
@@ -25,7 +25,7 @@
-
+
diff --git a/src/docs-builder/docs-builder.csproj b/src/docs-builder/docs-builder.csproj
index 59eabd4fd..da23f28be 100644
--- a/src/docs-builder/docs-builder.csproj
+++ b/src/docs-builder/docs-builder.csproj
@@ -27,7 +27,7 @@
-
+