diff --git a/RateLimiter/dirs.proj b/RateLimiter/dirs.proj
deleted file mode 100644
index c559821c..00000000
--- a/RateLimiter/dirs.proj
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <ProjectReference Include="RateLimiter\RateLimiter.csproj" />
-    <ProjectReference Include="RateLimiter.Tests\RateLimiter.Tests.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/RateLimiter/packages.lock.json b/RateLimiter/packages.lock.json
deleted file mode 100644
index ca2e4049..00000000
--- a/RateLimiter/packages.lock.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "version": 2,
-  "dependencies": {
-    ".NETFramework,Version=v4.5": {
-      "DotNet.ReproducibleBuilds": {
-        "type": "Direct",
-        "requested": "[1.1.1, )",
-        "resolved": "1.1.1",
-        "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
-        "dependencies": {
-          "Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
-          "Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
-          "Microsoft.SourceLink.GitHub": "1.1.1",
-          "Microsoft.SourceLink.GitLab": "1.1.1"
-        }
-      },
-      "Microsoft.CodeAnalysis.BannedApiAnalyzers": {
-        "type": "Direct",
-        "requested": "[3.3.3, )",
-        "resolved": "3.3.3",
-        "contentHash": "vvz3XCHVrd/Ks4xPoutLmL/T2+8JcOk/OMs3ngwQqnzokQCGEDsY+WjK/txCsDWU29sX3fGzH/FnYwNV93O1mA=="
-      },
-      "Microsoft.CodeAnalysis.NetAnalyzers": {
-        "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "cjG06LMeOADNUeCUaklOfVgrnVkLy80H5PVll4QHDUXv+C+6G9rHczrNdWjfb3xKv3Ts9s4UsP6J2ZWe52Gz4Q=="
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.3"
-        }
-      },
-      "Microsoft.SourceLink.GitHub": {
-        "type": "Direct",
-        "requested": "[1.1.1, )",
-        "resolved": "1.1.1",
-        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
-        "dependencies": {
-          "Microsoft.Build.Tasks.Git": "1.1.1",
-          "Microsoft.SourceLink.Common": "1.1.1"
-        }
-      },
-      "Nerdbank.GitVersioning": {
-        "type": "Direct",
-        "requested": "[3.5.113, )",
-        "resolved": "3.5.113",
-        "contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg=="
-      },
-      "StyleCop.Analyzers": {
-        "type": "Direct",
-        "requested": "[1.2.0-beta.435, )",
-        "resolved": "1.2.0-beta.435",
-        "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==",
-        "dependencies": {
-          "StyleCop.Analyzers.Unstable": "1.2.0.435"
-        }
-      },
-      "Microsoft.Build.Tasks.Git": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net45": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "dcSLNuUX2rfZejsyta2EWZ1W5U6ucbFt697lRg1qiTlTM5ZlYv4uAvuxE6ROy6xLWWhLhOaReCDxkhxcajRYtQ=="
-      },
-      "Microsoft.SourceLink.AzureRepos.Git": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
-        "dependencies": {
-          "Microsoft.Build.Tasks.Git": "1.1.1",
-          "Microsoft.SourceLink.Common": "1.1.1"
-        }
-      },
-      "Microsoft.SourceLink.Bitbucket.Git": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
-        "dependencies": {
-          "Microsoft.Build.Tasks.Git": "1.1.1",
-          "Microsoft.SourceLink.Common": "1.1.1"
-        }
-      },
-      "Microsoft.SourceLink.Common": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
-      },
-      "Microsoft.SourceLink.GitLab": {
-        "type": "Transitive",
-        "resolved": "1.1.1",
-        "contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
-        "dependencies": {
-          "Microsoft.Build.Tasks.Git": "1.1.1",
-          "Microsoft.SourceLink.Common": "1.1.1"
-        }
-      },
-      "StyleCop.Analyzers.Unstable": {
-        "type": "Transitive",
-        "resolved": "1.2.0.435",
-        "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg=="
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/dirs.proj b/dirs.proj
index 7b126850..81e277eb 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
     <ProjectReference Include="codelab\dirs.proj" />
-    <ProjectReference Include="RateLimiter\dirs.proj" />
     <ProjectReference Include="SharpCircularList\dirs.proj" />
     <ProjectReference Include="srcs\dirs.proj" />
     <ProjectReference Include="tests\dirs.proj" />
diff --git a/RateLimiter/RateLimiter/AssemblyInfo.cs b/srcs/RateLimiter/AssemblyInfo.cs
similarity index 100%
rename from RateLimiter/RateLimiter/AssemblyInfo.cs
rename to srcs/RateLimiter/AssemblyInfo.cs
diff --git a/RateLimiter/RateLimiter/GlobalSuppressions.cs b/srcs/RateLimiter/GlobalSuppressions.cs
similarity index 100%
rename from RateLimiter/RateLimiter/GlobalSuppressions.cs
rename to srcs/RateLimiter/GlobalSuppressions.cs
diff --git a/RateLimiter/RateLimiter/IAsyncBlocker.cs b/srcs/RateLimiter/IAsyncBlocker.cs
similarity index 100%
rename from RateLimiter/RateLimiter/IAsyncBlocker.cs
rename to srcs/RateLimiter/IAsyncBlocker.cs
diff --git a/RateLimiter/RateLimiter/IRateLimiter.cs b/srcs/RateLimiter/IRateLimiter.cs
similarity index 100%
rename from RateLimiter/RateLimiter/IRateLimiter.cs
rename to srcs/RateLimiter/IRateLimiter.cs
diff --git a/RateLimiter/README.md b/srcs/RateLimiter/README.md
similarity index 100%
rename from RateLimiter/README.md
rename to srcs/RateLimiter/README.md
diff --git a/RateLimiter/RateLimiter/RateLimiter.cs b/srcs/RateLimiter/RateLimiter.cs
similarity index 100%
rename from RateLimiter/RateLimiter/RateLimiter.cs
rename to srcs/RateLimiter/RateLimiter.cs
diff --git a/RateLimiter/RateLimiter/RateLimiter.csproj b/srcs/RateLimiter/RateLimiter.csproj
similarity index 100%
rename from RateLimiter/RateLimiter/RateLimiter.csproj
rename to srcs/RateLimiter/RateLimiter.csproj
diff --git a/RateLimiter/RateLimiter/RateLimiterBase.cs b/srcs/RateLimiter/RateLimiterBase.cs
similarity index 100%
rename from RateLimiter/RateLimiter/RateLimiterBase.cs
rename to srcs/RateLimiter/RateLimiterBase.cs
diff --git a/RateLimiter/RateLimiter/SmoothBurstyRateLimiter.cs b/srcs/RateLimiter/SmoothBurstyRateLimiter.cs
similarity index 100%
rename from RateLimiter/RateLimiter/SmoothBurstyRateLimiter.cs
rename to srcs/RateLimiter/SmoothBurstyRateLimiter.cs
diff --git a/RateLimiter/RateLimiter/SmoothRateLimiter.cs b/srcs/RateLimiter/SmoothRateLimiter.cs
similarity index 100%
rename from RateLimiter/RateLimiter/SmoothRateLimiter.cs
rename to srcs/RateLimiter/SmoothRateLimiter.cs
diff --git a/RateLimiter/RateLimiter/SmoothWarmingUpRateLimiter.cs b/srcs/RateLimiter/SmoothWarmingUpRateLimiter.cs
similarity index 100%
rename from RateLimiter/RateLimiter/SmoothWarmingUpRateLimiter.cs
rename to srcs/RateLimiter/SmoothWarmingUpRateLimiter.cs
diff --git a/RateLimiter/RateLimiter/TimeSpanExtensions.cs b/srcs/RateLimiter/TimeSpanExtensions.cs
similarity index 100%
rename from RateLimiter/RateLimiter/TimeSpanExtensions.cs
rename to srcs/RateLimiter/TimeSpanExtensions.cs
diff --git a/RateLimiter/RateLimiter/TryAcquireResult.cs b/srcs/RateLimiter/TryAcquireResult.cs
similarity index 100%
rename from RateLimiter/RateLimiter/TryAcquireResult.cs
rename to srcs/RateLimiter/TryAcquireResult.cs
diff --git a/RateLimiter/RateLimiter/packages.lock.json b/srcs/RateLimiter/packages.lock.json
similarity index 100%
rename from RateLimiter/RateLimiter/packages.lock.json
rename to srcs/RateLimiter/packages.lock.json
diff --git a/RateLimiter/version.json b/srcs/RateLimiter/version.json
similarity index 100%
rename from RateLimiter/version.json
rename to srcs/RateLimiter/version.json
diff --git a/srcs/dirs.proj b/srcs/dirs.proj
index a672270a..111239d5 100644
--- a/srcs/dirs.proj
+++ b/srcs/dirs.proj
@@ -5,6 +5,8 @@
     <ProjectReference Include="MicrosoftExtensions.Logging.MSTest\MicrosoftExtensions.Logging.MSTest.csproj" />
     <ProjectReference Include="MicrosoftExtensions.Logging.Xunit\MicrosoftExtensions.Logging.Xunit.csproj" />
     <ProjectReference Include="MicrosoftExtensions.Options.DedupChangeExtensions\MicrosoftExtensions.Options.DedupChangeExtensions.csproj" />
+    <ProjectReference Include="PhiFailureDetector\dirs.proj" />
+    <ProjectReference Include="RateLimiter\RateLimiter.csproj" />
     <ProjectReference Include="WebHdfs.Extensions.FileProviders\WebHdfs.Extensions.FileProviders.csproj" />
   </ItemGroup>
 </Project>
diff --git a/RateLimiter/RateLimiter.Tests/FakeStopwatchProviderAndBlocker.cs b/tests/RateLimiter.Tests/FakeStopwatchProviderAndBlocker.cs
similarity index 100%
rename from RateLimiter/RateLimiter.Tests/FakeStopwatchProviderAndBlocker.cs
rename to tests/RateLimiter.Tests/FakeStopwatchProviderAndBlocker.cs
diff --git a/RateLimiter/RateLimiter.Tests/RateLimiter.Tests.csproj b/tests/RateLimiter.Tests/RateLimiter.Tests.csproj
similarity index 81%
rename from RateLimiter/RateLimiter.Tests/RateLimiter.Tests.csproj
rename to tests/RateLimiter.Tests/RateLimiter.Tests.csproj
index c751190d..c39e98f8 100644
--- a/RateLimiter/RateLimiter.Tests/RateLimiter.Tests.csproj
+++ b/tests/RateLimiter.Tests/RateLimiter.Tests.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\RateLimiter\RateLimiter.csproj" />
+    <ProjectReference Include="$(EnlistmentRoot)\srcs\RateLimiter\RateLimiter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/RateLimiter/RateLimiter.Tests/RateLimiterTest.cs b/tests/RateLimiter.Tests/RateLimiterTest.cs
similarity index 100%
rename from RateLimiter/RateLimiter.Tests/RateLimiterTest.cs
rename to tests/RateLimiter.Tests/RateLimiterTest.cs
diff --git a/RateLimiter/RateLimiter.Tests/packages.lock.json b/tests/RateLimiter.Tests/packages.lock.json
similarity index 100%
rename from RateLimiter/RateLimiter.Tests/packages.lock.json
rename to tests/RateLimiter.Tests/packages.lock.json
diff --git a/tests/dirs.proj b/tests/dirs.proj
index dbcb52fc..d78b4c4d 100644
--- a/tests/dirs.proj
+++ b/tests/dirs.proj
@@ -3,6 +3,7 @@
     <ProjectReference Include="Memoization.Tests\Memoization.Tests.csproj" />
     <ProjectReference Include="MicrosoftExtensions.Logging.Xunit.Tests\MicrosoftExtensions.Logging.Xunit.Tests.csproj" />
     <ProjectReference Include="PhiFailureDetector.UnitTest\PhiFailureDetector.UnitTest.csproj" />
+    <ProjectReference Include="RateLimiter.Tests\RateLimiter.Tests.csproj" />
     <!-- Need to prepare config.dev.ini -->
     <!-- <ProjectReference Include="WebHdfs.Extensions.FileProviders.UnitTest\WebHdfs.Extensions.FileProviders.UnitTest.csproj" /> -->
   </ItemGroup>
diff --git a/version.json b/version.json
index ac67f4f3..a666e94f 100644
--- a/version.json
+++ b/version.json
@@ -8,7 +8,7 @@
     "^srcs/WebHdfs.Extensions.FileProviders",
     "^srcs/MicrosoftExtensions.Options.DedupChangeExtensions",
     "^srcs/PhiFailureDetector",
-    "^RateLimiter"
+    "^srcs/RateLimiter"
   ],
   "gitCommitIdShortFixedLength": 7,
   "gitCommitIdShortAutoMinimum": 7,