diff --git a/http_logs_1753146682__latentinjection.LatentInjectionFactSnippetLegal.json b/tests/logs/http/http_logs_1753146682__latentinjection.LatentInjectionFactSnippetLegal.json
similarity index 100%
rename from http_logs_1753146682__latentinjection.LatentInjectionFactSnippetLegal.json
rename to tests/logs/http/http_logs_1753146682__latentinjection.LatentInjectionFactSnippetLegal.json
diff --git a/http_logs_1753182430__dan.DanInTheWild.json b/tests/logs/http/http_logs_1753182430__dan.DanInTheWild.json
similarity index 100%
rename from http_logs_1753182430__dan.DanInTheWild.json
rename to tests/logs/http/http_logs_1753182430__dan.DanInTheWild.json
diff --git a/http_logs_1753209001__dan.DanInTheWild.json b/tests/logs/http/http_logs_1753209001__dan.DanInTheWild.json
similarity index 100%
rename from http_logs_1753209001__dan.DanInTheWild.json
rename to tests/logs/http/http_logs_1753209001__dan.DanInTheWild.json
diff --git a/http_logs_1753229565__dan.DUDE.json b/tests/logs/http/http_logs_1753229565__dan.DUDE.json
similarity index 100%
rename from http_logs_1753229565__dan.DUDE.json
rename to tests/logs/http/http_logs_1753229565__dan.DUDE.json
diff --git a/http_logs_1753231480__latentinjection.LatentInjectionReport.json b/tests/logs/http/http_logs_1753231480__latentinjection.LatentInjectionReport.json
similarity index 100%
rename from http_logs_1753231480__latentinjection.LatentInjectionReport.json
rename to tests/logs/http/http_logs_1753231480__latentinjection.LatentInjectionReport.json
diff --git a/http_logs_1753269270__latentinjection.LatentInjectionResume.json b/tests/logs/http/http_logs_1753269270__latentinjection.LatentInjectionResume.json
similarity index 100%
rename from http_logs_1753269270__latentinjection.LatentInjectionResume.json
rename to tests/logs/http/http_logs_1753269270__latentinjection.LatentInjectionResume.json
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__ansiescape.AnsiEscaped.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__ansiescape.AnsiEscaped.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__ansiescape.AnsiEscaped.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__ansiescape.AnsiEscaped.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__dan.DAN_Jailbreak.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.DAN_Jailbreak.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__dan.DAN_Jailbreak.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.DAN_Jailbreak.txt
diff --git a/tests/security/garak_logs__dan.DUDE.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.DUDE.txt
similarity index 100%
rename from tests/security/garak_logs__dan.DUDE.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.DUDE.txt
diff --git a/tests/security/garak_logs__dan.DanInTheWild.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.DanInTheWild.txt
similarity index 100%
rename from tests/security/garak_logs__dan.DanInTheWild.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.DanInTheWild.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__dan.STAN.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.STAN.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__dan.STAN.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__dan.STAN.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__divergence.Repeat.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__divergence.Repeat.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__divergence.Repeat.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__divergence.Repeat.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__encoding.InjectAscii85.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__encoding.InjectAscii85.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__encoding.InjectAscii85.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__encoding.InjectAscii85.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__exploitation.SQLInjectionEcho.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__exploitation.SQLInjectionEcho.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__exploitation.SQLInjectionEcho.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__exploitation.SQLInjectionEcho.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__exploitation.SQLInjectionSystem.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__exploitation.SQLInjectionSystem.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__exploitation.SQLInjectionSystem.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__exploitation.SQLInjectionSystem.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__goodside.Davidjl.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__goodside.Davidjl.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__goodside.Davidjl.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__goodside.Davidjl.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__goodside.Tag.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__goodside.Tag.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__goodside.Tag.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__goodside.Tag.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__grandma.Substances.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__grandma.Substances.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__grandma.Substances.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__grandma.Substances.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__grandma.Win10.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__grandma.Win10.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__grandma.Win10.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__grandma.Win10.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__grandma.Win11.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__grandma.Win11.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__grandma.Win11.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__grandma.Win11.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__latentinjection.LatentInjectionFactSnippetEiffel.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionFactSnippetEiffel.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__latentinjection.LatentInjectionFactSnippetEiffel.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionFactSnippetEiffel.txt
diff --git a/tests/security/garak_logs__latentinjection.LatentInjectionFactSnippetLegal.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionFactSnippetLegal.txt
similarity index 100%
rename from tests/security/garak_logs__latentinjection.LatentInjectionFactSnippetLegal.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionFactSnippetLegal.txt
diff --git a/tests/security/garak_logs__latentinjection.LatentInjectionReport.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionReport.txt
similarity index 100%
rename from tests/security/garak_logs__latentinjection.LatentInjectionReport.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionReport.txt
diff --git a/tests/security/garak_logs__latentinjection.LatentInjectionResume.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionResume.txt
similarity index 100%
rename from tests/security/garak_logs__latentinjection.LatentInjectionResume.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentInjectionResume.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__latentinjection.LatentJailbreak.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentJailbreak.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__latentinjection.LatentJailbreak.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentJailbreak.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__latentinjection.LatentWhois.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentWhois.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__latentinjection.LatentWhois.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__latentinjection.LatentWhois.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__leakreplay.GuardianCloze.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__leakreplay.GuardianCloze.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__leakreplay.GuardianCloze.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__leakreplay.GuardianCloze.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__leakreplay.GuardianComplete.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__leakreplay.GuardianComplete.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__leakreplay.GuardianComplete.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__leakreplay.GuardianComplete.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__leakreplay.NYTComplete.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__leakreplay.NYTComplete.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__leakreplay.NYTComplete.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__leakreplay.NYTComplete.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__malwaregen.Evasion.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__malwaregen.Evasion.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__malwaregen.Evasion.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__malwaregen.Evasion.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__malwaregen.Payload.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__malwaregen.Payload.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__malwaregen.Payload.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__malwaregen.Payload.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__misleading.FalseAssertion.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__misleading.FalseAssertion.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__misleading.FalseAssertion.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__misleading.FalseAssertion.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__misleading.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__misleading.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__misleading.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__misleading.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__phrasing.FutureTense.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__phrasing.FutureTense.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__phrasing.FutureTense.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__phrasing.FutureTense.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__promptinject.HijackHateHumans.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__promptinject.HijackHateHumans.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__promptinject.HijackHateHumans.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__promptinject.HijackHateHumans.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__promptinject.HijackKillHumans.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__promptinject.HijackKillHumans.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__promptinject.HijackKillHumans.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__promptinject.HijackKillHumans.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__snowball.Primes.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__snowball.Primes.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__snowball.Primes.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__snowball.Primes.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__suffix.BEAST.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__suffix.BEAST.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__suffix.BEAST.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__suffix.BEAST.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__topic.WordnetAllowedWords.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__topic.WordnetAllowedWords.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__topic.WordnetAllowedWords.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__topic.WordnetAllowedWords.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__xss.ColabAIDataLeakage.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__xss.ColabAIDataLeakage.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__xss.ColabAIDataLeakage.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__xss.ColabAIDataLeakage.txt
diff --git a/tests/security/tests/results/01_no_guidelines/garak_logs__xss.StringAssemblyDataExfil.txt b/tests/security/tests/results/01_garak_no_guidelines/garak_logs__xss.StringAssemblyDataExfil.txt
similarity index 100%
rename from tests/security/tests/results/01_no_guidelines/garak_logs__xss.StringAssemblyDataExfil.txt
rename to tests/security/tests/results/01_garak_no_guidelines/garak_logs__xss.StringAssemblyDataExfil.txt