diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6bc90077..0d48010d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -12,8 +12,8 @@
 
 ## Validation
 
-- [ ] `dotnet build -c Release ./src`
-- [ ] `dotnet format --verify-no-changes --verbosity detailed --no-restore ./src`
+- [ ] `dotnet build -c Release ./Acmebot.slnx`
+- [ ] `dotnet format --verify-no-changes --verbosity detailed --no-restore ./Acmebot.slnx`
 - [ ] `az bicep build -f ./deploy/azuredeploy.bicep`
 - [ ] Documentation updated if needed
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0c3f13d..61662a00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
         az bicep install --version v${{ env.BICEP_VERSION }}
 
     - name: Build project
-      run: dotnet build -c Release ./src
+      run: dotnet build -c Release ./Acmebot.slnx
 
     - name: Lint C# code
-      run: dotnet format --verify-no-changes --verbosity detailed --no-restore ./src
+      run: dotnet format --verify-no-changes --verbosity detailed --no-restore ./Acmebot.slnx
 
     - name: Lint Bicep template
       run: az bicep build -f ./deploy/azuredeploy.bicep && git diff --exit-code --quiet
diff --git a/Acmebot.slnx b/Acmebot.slnx
new file mode 100644
index 00000000..4aed80ef
--- /dev/null
+++ b/Acmebot.slnx
@@ -0,0 +1,12 @@
+<Solution>
+  <Folder Name="/src/">
+    <Project Path="src/Acmebot.Acme/Acmebot.Acme.csproj" />
+    <Project Path="src/Acmebot.App/Acmebot.App.csproj" />
+  </Folder>
+  <Folder Name="/samples/">
+    <Project Path="samples/Acmebot.Acme.Sample/Acmebot.Acme.Sample.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9620c04d..a5b712bd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,9 +29,9 @@ cd acmebot
 Run these commands from the repository root.
 
 ```bash
-dotnet restore ./src
-dotnet build -c Release ./src
-dotnet format --verify-no-changes --verbosity detailed --no-restore ./src
+dotnet restore ./Acmebot.slnx
+dotnet build -c Release ./Acmebot.slnx
+dotnet format --verify-no-changes --verbosity detailed --no-restore ./Acmebot.slnx
 az bicep build -f ./deploy/azuredeploy.bicep
 ```
 
diff --git a/src/Acmebot.slnx b/src/Acmebot.slnx
deleted file mode 100644
index e57ea816..00000000
--- a/src/Acmebot.slnx
+++ /dev/null
@@ -1,5 +0,0 @@
-<Solution>
-  <Project Path="Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj" />
-  <Project Path="Acmebot.Acme/Acmebot.Acme.csproj" Id="c532397c-d225-4b1d-8b80-4b63ce03eef5" />
-  <Project Path="Acmebot.App/Acmebot.App.csproj" />
-</Solution>
diff --git a/src/Acmebot.Acme.Tests/AcmeChallengeInstructionsTests.cs b/tests/Acmebot.Acme.Tests/AcmeChallengeInstructionsTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeChallengeInstructionsTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeChallengeInstructionsTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeClientErrorTests.cs b/tests/Acmebot.Acme.Tests/AcmeClientErrorTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeClientErrorTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeClientErrorTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeClientMetadataTests.cs b/tests/Acmebot.Acme.Tests/AcmeClientMetadataTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeClientMetadataTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeClientMetadataTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeClientProtocolTests.cs b/tests/Acmebot.Acme.Tests/AcmeClientProtocolTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeClientProtocolTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeClientProtocolTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeClientResourceTests.cs b/tests/Acmebot.Acme.Tests/AcmeClientResourceTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeClientResourceTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeClientResourceTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeClientTests.cs b/tests/Acmebot.Acme.Tests/AcmeClientTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeClientTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeClientTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeProfileValidationTests.cs b/tests/Acmebot.Acme.Tests/AcmeProfileValidationTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeProfileValidationTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeProfileValidationTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeSignerTests.cs b/tests/Acmebot.Acme.Tests/AcmeSignerTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeSignerTests.cs
rename to tests/Acmebot.Acme.Tests/AcmeSignerTests.cs
diff --git a/src/Acmebot.Acme.Tests/AcmeTestSupport.cs b/tests/Acmebot.Acme.Tests/AcmeTestSupport.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/AcmeTestSupport.cs
rename to tests/Acmebot.Acme.Tests/AcmeTestSupport.cs
diff --git a/src/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj b/tests/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj
similarity index 90%
rename from src/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj
rename to tests/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj
index d7a8664b..a0e128bb 100644
--- a/src/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj
+++ b/tests/Acmebot.Acme.Tests/Acmebot.Acme.Tests.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Acmebot.Acme\Acmebot.Acme.csproj" />
+    <ProjectReference Include="..\..\src\Acmebot.Acme\Acmebot.Acme.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Acmebot.Acme.Tests/Internal/AcmeHeaderParserTests.cs b/tests/Acmebot.Acme.Tests/Internal/AcmeHeaderParserTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/Internal/AcmeHeaderParserTests.cs
rename to tests/Acmebot.Acme.Tests/Internal/AcmeHeaderParserTests.cs
diff --git a/src/Acmebot.Acme.Tests/Internal/AcmeNonceStoreTests.cs b/tests/Acmebot.Acme.Tests/Internal/AcmeNonceStoreTests.cs
similarity index 100%
rename from src/Acmebot.Acme.Tests/Internal/AcmeNonceStoreTests.cs
rename to tests/Acmebot.Acme.Tests/Internal/AcmeNonceStoreTests.cs