diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-1.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-1/andbytestring-case-1.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-1.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-1/andbytestring-case-1.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-1.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-1/andbytestring-case-1.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-1.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-1/andbytestring-case-1.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-1.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-1/andbytestring-case-1.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-1.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-1/andbytestring-case-1.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-10.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-10/andbytestring-case-10.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-10.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-10/andbytestring-case-10.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-10.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-10/andbytestring-case-10.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-10.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-10/andbytestring-case-10.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-10.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-10/andbytestring-case-10.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-10.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-10/andbytestring-case-10.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-2.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-2/andbytestring-case-2.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-2.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-2/andbytestring-case-2.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-2.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-2/andbytestring-case-2.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-2.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-2/andbytestring-case-2.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-2.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-2/andbytestring-case-2.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-2.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-2/andbytestring-case-2.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-3.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-3/andbytestring-case-3.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-3.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-3/andbytestring-case-3.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-3.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-3/andbytestring-case-3.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-3.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-3/andbytestring-case-3.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-3.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-3/andbytestring-case-3.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-3.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-3/andbytestring-case-3.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-4.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-4/andbytestring-case-4.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-4.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-4/andbytestring-case-4.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-4.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-4/andbytestring-case-4.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-4.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-4/andbytestring-case-4.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-4.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-4/andbytestring-case-4.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-4.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-4/andbytestring-case-4.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-5.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-5/andbytestring-case-5.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-5.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-5/andbytestring-case-5.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-5.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-5/andbytestring-case-5.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-5.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-5/andbytestring-case-5.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-5.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-5/andbytestring-case-5.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-5.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-5/andbytestring-case-5.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-6.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-6/andbytestring-case-6.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-6.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-6/andbytestring-case-6.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-6.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-6/andbytestring-case-6.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-6.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-6/andbytestring-case-6.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-6.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-6/andbytestring-case-6.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-6.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-6/andbytestring-case-6.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-7.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-7/andbytestring-case-7.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-7.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-7/andbytestring-case-7.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-7.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-7/andbytestring-case-7.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-7.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-7/andbytestring-case-7.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-7.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-7/andbytestring-case-7.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-7.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-7/andbytestring-case-7.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-8.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-8/andbytestring-case-8.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-8.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-8/andbytestring-case-8.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-8.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-8/andbytestring-case-8.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-8.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-8/andbytestring-case-8.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-8.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-8/andbytestring-case-8.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-8.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-8/andbytestring-case-8.uplc.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-9.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-9/andbytestring-case-9.uplc
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-9.uplc
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-9/andbytestring-case-9.uplc
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-9.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-9/andbytestring-case-9.uplc.budget.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-9.uplc.budget.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-9/andbytestring-case-9.uplc.budget.expected
diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-9.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-9/andbytestring-case-9.uplc.expected
similarity index 100%
rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/andbytestring-case-9.uplc.expected
rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/andByteString/case-9/andbytestring-case-9.uplc.expected