diff --git a/StrataTest/Languages/Core/Examples/AssertionDefaultNames.lean b/StrataTest/Languages/Core/Tests/AssertionDefaultNames.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/AssertionDefaultNames.lean
rename to StrataTest/Languages/Core/Tests/AssertionDefaultNames.lean
diff --git a/StrataTest/Languages/Core/CmdEvalTests.lean b/StrataTest/Languages/Core/Tests/CmdEvalTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/CmdEvalTests.lean
rename to StrataTest/Languages/Core/Tests/CmdEvalTests.lean
diff --git a/StrataTest/Languages/Core/CounterExampleLiftTest.lean b/StrataTest/Languages/Core/Tests/CounterExampleLiftTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/CounterExampleLiftTest.lean
rename to StrataTest/Languages/Core/Tests/CounterExampleLiftTest.lean
diff --git a/StrataTest/Languages/Core/Examples/DatatypeEval.lean b/StrataTest/Languages/Core/Tests/DatatypeEval.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/DatatypeEval.lean
rename to StrataTest/Languages/Core/Tests/DatatypeEval.lean
diff --git a/StrataTest/Languages/Core/Examples/DatatypeTests.lean b/StrataTest/Languages/Core/Tests/DatatypeTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/DatatypeTests.lean
rename to StrataTest/Languages/Core/Tests/DatatypeTests.lean
diff --git a/StrataTest/Languages/Core/Examples/DatatypeTypingTests.lean b/StrataTest/Languages/Core/Tests/DatatypeTypingTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/DatatypeTypingTests.lean
rename to StrataTest/Languages/Core/Tests/DatatypeTypingTests.lean
diff --git a/StrataTest/Languages/Core/Examples/DuplicateAssumeLabels.lean b/StrataTest/Languages/Core/Tests/DuplicateAssumeLabels.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/DuplicateAssumeLabels.lean
rename to StrataTest/Languages/Core/Tests/DuplicateAssumeLabels.lean
diff --git a/StrataTest/Languages/Core/ExprEvalTest.lean b/StrataTest/Languages/Core/Tests/ExprEvalTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/ExprEvalTest.lean
rename to StrataTest/Languages/Core/Tests/ExprEvalTest.lean
diff --git a/StrataTest/Languages/Core/FuncDeclStmtTest.lean b/StrataTest/Languages/Core/Tests/FuncDeclStmtTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/FuncDeclStmtTest.lean
rename to StrataTest/Languages/Core/Tests/FuncDeclStmtTest.lean
diff --git a/StrataTest/Languages/Core/Examples/FuncTypeCheckBody.lean b/StrataTest/Languages/Core/Tests/FuncTypeCheckBody.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/FuncTypeCheckBody.lean
rename to StrataTest/Languages/Core/Tests/FuncTypeCheckBody.lean
diff --git a/StrataTest/Languages/Core/Examples/FunctionDeclDDMTest.lean b/StrataTest/Languages/Core/Tests/FunctionDeclDDMTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/FunctionDeclDDMTest.lean
rename to StrataTest/Languages/Core/Tests/FunctionDeclDDMTest.lean
diff --git a/StrataTest/Languages/Core/FunctionTests.lean b/StrataTest/Languages/Core/Tests/FunctionTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/FunctionTests.lean
rename to StrataTest/Languages/Core/Tests/FunctionTests.lean
diff --git a/StrataTest/Languages/Core/Examples/GeneratedLabels.lean b/StrataTest/Languages/Core/Tests/GeneratedLabels.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/GeneratedLabels.lean
rename to StrataTest/Languages/Core/Tests/GeneratedLabels.lean
diff --git a/StrataTest/Languages/Core/Examples/IfElsePrecedenceTest.lean b/StrataTest/Languages/Core/Tests/IfElsePrecedenceTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/IfElsePrecedenceTest.lean
rename to StrataTest/Languages/Core/Tests/IfElsePrecedenceTest.lean
diff --git a/StrataTest/Languages/Core/NestedVarScopingTest.lean b/StrataTest/Languages/Core/Tests/NestedVarScopingTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/NestedVarScopingTest.lean
rename to StrataTest/Languages/Core/Tests/NestedVarScopingTest.lean
diff --git a/StrataTest/Languages/Core/PolyUnifTest.lean b/StrataTest/Languages/Core/Tests/PolyUnifTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/PolyUnifTest.lean
rename to StrataTest/Languages/Core/Tests/PolyUnifTest.lean
diff --git a/StrataTest/Languages/Core/PolymorphicDatatypeTest.lean b/StrataTest/Languages/Core/Tests/PolymorphicDatatypeTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/PolymorphicDatatypeTest.lean
rename to StrataTest/Languages/Core/Tests/PolymorphicDatatypeTest.lean
diff --git a/StrataTest/Languages/Core/PolymorphicFunctionTest.lean b/StrataTest/Languages/Core/Tests/PolymorphicFunctionTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/PolymorphicFunctionTest.lean
rename to StrataTest/Languages/Core/Tests/PolymorphicFunctionTest.lean
diff --git a/StrataTest/Languages/Core/PolymorphicProcedureTest.lean b/StrataTest/Languages/Core/Tests/PolymorphicProcedureTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/PolymorphicProcedureTest.lean
rename to StrataTest/Languages/Core/Tests/PolymorphicProcedureTest.lean
diff --git a/StrataTest/Languages/Core/Examples/PrecedenceCheck.lean b/StrataTest/Languages/Core/Tests/PrecedenceCheck.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/PrecedenceCheck.lean
rename to StrataTest/Languages/Core/Tests/PrecedenceCheck.lean
diff --git a/StrataTest/Languages/Core/ProcedureEvalTests.lean b/StrataTest/Languages/Core/Tests/ProcedureEvalTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/ProcedureEvalTests.lean
rename to StrataTest/Languages/Core/Tests/ProcedureEvalTests.lean
diff --git a/StrataTest/Languages/Core/ProcedureTypeTests.lean b/StrataTest/Languages/Core/Tests/ProcedureTypeTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/ProcedureTypeTests.lean
rename to StrataTest/Languages/Core/Tests/ProcedureTypeTests.lean
diff --git a/StrataTest/Languages/Core/ProgramTypeTests.lean b/StrataTest/Languages/Core/Tests/ProgramTypeTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/ProgramTypeTests.lean
rename to StrataTest/Languages/Core/Tests/ProgramTypeTests.lean
diff --git a/StrataTest/Languages/Core/Examples/RecursiveFunctionDDMTest.lean b/StrataTest/Languages/Core/Tests/RecursiveFunctionDDMTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/RecursiveFunctionDDMTest.lean
rename to StrataTest/Languages/Core/Tests/RecursiveFunctionDDMTest.lean
diff --git a/StrataTest/Languages/Core/RecursiveFunctionErrorTest.lean b/StrataTest/Languages/Core/Tests/RecursiveFunctionErrorTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/RecursiveFunctionErrorTest.lean
rename to StrataTest/Languages/Core/Tests/RecursiveFunctionErrorTest.lean
diff --git a/StrataTest/Languages/Core/RecursiveFunctionTests.lean b/StrataTest/Languages/Core/Tests/RecursiveFunctionTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/RecursiveFunctionTests.lean
rename to StrataTest/Languages/Core/Tests/RecursiveFunctionTests.lean
diff --git a/StrataTest/Languages/Core/SMTEncoderDatatypeTest.lean b/StrataTest/Languages/Core/Tests/SMTEncoderDatatypeTest.lean
similarity index 100%
rename from StrataTest/Languages/Core/SMTEncoderDatatypeTest.lean
rename to StrataTest/Languages/Core/Tests/SMTEncoderDatatypeTest.lean
diff --git a/StrataTest/Languages/Core/SMTEncoderTests.lean b/StrataTest/Languages/Core/Tests/SMTEncoderTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/SMTEncoderTests.lean
rename to StrataTest/Languages/Core/Tests/SMTEncoderTests.lean
diff --git a/StrataTest/Languages/Core/SarifOutputTests.lean b/StrataTest/Languages/Core/Tests/SarifOutputTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/SarifOutputTests.lean
rename to StrataTest/Languages/Core/Tests/SarifOutputTests.lean
diff --git a/StrataTest/Languages/Core/Examples/ShadowedVars.lean b/StrataTest/Languages/Core/Tests/ShadowedVars.lean
similarity index 100%
rename from StrataTest/Languages/Core/Examples/ShadowedVars.lean
rename to StrataTest/Languages/Core/Tests/ShadowedVars.lean
diff --git a/StrataTest/Languages/Core/StatementEvalTests.lean b/StrataTest/Languages/Core/Tests/StatementEvalTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/StatementEvalTests.lean
rename to StrataTest/Languages/Core/Tests/StatementEvalTests.lean
diff --git a/StrataTest/Languages/Core/StatementTypeTests.lean b/StrataTest/Languages/Core/Tests/StatementTypeTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/StatementTypeTests.lean
rename to StrataTest/Languages/Core/Tests/StatementTypeTests.lean
diff --git a/StrataTest/Languages/Core/TestASTtoCST.lean b/StrataTest/Languages/Core/Tests/TestASTtoCST.lean
similarity index 100%
rename from StrataTest/Languages/Core/TestASTtoCST.lean
rename to StrataTest/Languages/Core/Tests/TestASTtoCST.lean
diff --git a/StrataTest/Languages/Core/TypeDeclTests.lean b/StrataTest/Languages/Core/Tests/TypeDeclTests.lean
similarity index 100%
rename from StrataTest/Languages/Core/TypeDeclTests.lean
rename to StrataTest/Languages/Core/Tests/TypeDeclTests.lean