diff --git a/.github/workflows/trace-contract.yaml b/.github/workflows/trace-contract.yaml
new file mode 100644
index 00000000..b24451ef
--- /dev/null
+++ b/.github/workflows/trace-contract.yaml
@@ -0,0 +1,42 @@
+name: Trace Contract
+
+on:
+  workflow_dispatch:
+    inputs:
+      purchaseid:
+        description: "Testnet Purchase ID"
+        required: true
+        type: string
+
+env:
+  SOURCE: ${{ format('{0}/{1}', github.server_url, github.repository) }}
+  BRANCH: ${{ github.ref_name }}
+  OUTPUT_FOLDER: "/tmp"
+  ES_USERNAME: ${{ secrets.ES_USERNAME }}
+  ES_PASSWORD: ${{ secrets.ES_PASSWORD }}
+
+jobs:
+  run_tests:
+    name: Run Release Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ inputs.workflow_source }}
+
+      - name: Variables
+        run: |
+          echo "PURCHASE_ID=${{ inputs.purchaseid }}" >> $GITHUB_ENV
+
+      - name: Run Trace
+        run: |
+          dotnet run --project Tools/TraceContract
+
+      - name: Upload output
+        uses: actions/upload-artifact@v4
+        with:
+          name: contract-trace
+          path: /tmp/*
+          if-no-files-found: error
+          retention-days: 7
diff --git a/TraceContract/ChainRequestTracker.cs b/Tools/TraceContract/ChainRequestTracker.cs
similarity index 100%
rename from TraceContract/ChainRequestTracker.cs
rename to Tools/TraceContract/ChainRequestTracker.cs
diff --git a/TraceContract/ChainTracer.cs b/Tools/TraceContract/ChainTracer.cs
similarity index 100%
rename from TraceContract/ChainTracer.cs
rename to Tools/TraceContract/ChainTracer.cs
diff --git a/TraceContract/Config.cs b/Tools/TraceContract/Config.cs
similarity index 100%
rename from TraceContract/Config.cs
rename to Tools/TraceContract/Config.cs
diff --git a/TraceContract/ElasticSearchLogDownloader.cs b/Tools/TraceContract/ElasticSearchLogDownloader.cs
similarity index 100%
rename from TraceContract/ElasticSearchLogDownloader.cs
rename to Tools/TraceContract/ElasticSearchLogDownloader.cs
diff --git a/TraceContract/Input.cs b/Tools/TraceContract/Input.cs
similarity index 100%
rename from TraceContract/Input.cs
rename to Tools/TraceContract/Input.cs
diff --git a/TraceContract/Output.cs b/Tools/TraceContract/Output.cs
similarity index 100%
rename from TraceContract/Output.cs
rename to Tools/TraceContract/Output.cs
diff --git a/TraceContract/Program.cs b/Tools/TraceContract/Program.cs
similarity index 100%
rename from TraceContract/Program.cs
rename to Tools/TraceContract/Program.cs
diff --git a/TraceContract/TraceContract.csproj b/Tools/TraceContract/TraceContract.csproj
similarity index 51%
rename from TraceContract/TraceContract.csproj
rename to Tools/TraceContract/TraceContract.csproj
index 3bcdeedb..51fd39c6 100644
--- a/TraceContract/TraceContract.csproj
+++ b/Tools/TraceContract/TraceContract.csproj
@@ -8,9 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Framework\Logging\Logging.csproj" />
-    <ProjectReference Include="..\ProjectPlugins\CodexContractsPlugin\CodexContractsPlugin.csproj" />
-    <ProjectReference Include="..\ProjectPlugins\GethPlugin\GethPlugin.csproj" />
+    <ProjectReference Include="..\..\ProjectPlugins\CodexContractsPlugin\CodexContractsPlugin.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/cs-codex-dist-testing.sln b/cs-codex-dist-testing.sln
index 18dd9a2e..a10e32d6 100644
--- a/cs-codex-dist-testing.sln
+++ b/cs-codex-dist-testing.sln
@@ -86,7 +86,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodexClient", "ProjectPlugi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebUtils", "Framework\WebUtils\WebUtils.csproj", "{372C9E5D-5453-4D45-9948-E9324E21AD65}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TraceContract", "TraceContract\TraceContract.csproj", "{6F4C72D7-4B6E-45FD-93C6-2099CBE5B2AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TraceContract", "Tools\TraceContract\TraceContract.csproj", "{58CDACE0-8F8D-2BB7-EA3A-0CB6A994A7F8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -234,10 +234,10 @@ Global
 		{372C9E5D-5453-4D45-9948-E9324E21AD65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{372C9E5D-5453-4D45-9948-E9324E21AD65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{372C9E5D-5453-4D45-9948-E9324E21AD65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F4C72D7-4B6E-45FD-93C6-2099CBE5B2AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F4C72D7-4B6E-45FD-93C6-2099CBE5B2AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F4C72D7-4B6E-45FD-93C6-2099CBE5B2AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F4C72D7-4B6E-45FD-93C6-2099CBE5B2AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58CDACE0-8F8D-2BB7-EA3A-0CB6A994A7F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58CDACE0-8F8D-2BB7-EA3A-0CB6A994A7F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58CDACE0-8F8D-2BB7-EA3A-0CB6A994A7F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58CDACE0-8F8D-2BB7-EA3A-0CB6A994A7F8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -278,7 +278,7 @@ Global
 		{4648B5AA-A0A7-44BA-89BC-2FD57370943C} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7}
 		{9AF12703-29AF-416D-9781-204223D6D0E5} = {8F1F1C2A-E313-4E0C-BE40-58FB0BA91124}
 		{372C9E5D-5453-4D45-9948-E9324E21AD65} = {81AE04BC-CBFA-4E6F-B039-8208E9AFAAE7}
-		{6F4C72D7-4B6E-45FD-93C6-2099CBE5B2AC} = {7591C5B3-D86E-4AE4-8ED2-B272D17FE7E3}
+		{58CDACE0-8F8D-2BB7-EA3A-0CB6A994A7F8} = {7591C5B3-D86E-4AE4-8ED2-B272D17FE7E3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {237BF0AA-9EC4-4659-AD9A-65DEB974250C}