diff --git a/tests/Validation/ValidationTest.php b/tests/Validation/ValidationTest.php
index 2bbb565..5253d21 100644
--- a/tests/Validation/ValidationTest.php
+++ b/tests/Validation/ValidationTest.php
@@ -26,7 +26,7 @@ class ValidationTest extends TestCase
     public function validationTestProvider()
     {
         $testProviderArray = array();
-        $testCasesDir = realpath(__DIR__ . '/../../validation/frameworks/_cases');
+        $testCasesDir = realpath(__DIR__ . '/cases');
 
         $iterator = new RecursiveDirectoryIterator($testCasesDir);
         $disabled = json_decode(file_get_contents(__DIR__ . '/disabled.json'));
@@ -100,7 +100,7 @@ class ValidationTest extends TestCase
         );
 
         // Turn references into relative paths
-        $testCasesDir = realpath(__DIR__ . '/../../validation/frameworks/_cases');
+        $testCasesDir = realpath(__DIR__ . '/cases');
         foreach ($refsAndDefs['references'] as $key => $list) {
             $fixedPathRefs = array_map(function ($ref) use ($testCasesDir) {
                 return str_replace($testCasesDir, '.', $ref);
diff --git a/validation/frameworks/_cases/WithReturnTypehints.php b/tests/Validation/cases/WithReturnTypehints.php
similarity index 100%
rename from validation/frameworks/_cases/WithReturnTypehints.php
rename to tests/Validation/cases/WithReturnTypehints.php
diff --git a/validation/frameworks/_cases/WithReturnTypehints.php.expected.json b/tests/Validation/cases/WithReturnTypehints.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/WithReturnTypehints.php.expected.json
rename to tests/Validation/cases/WithReturnTypehints.php.expected.json
diff --git a/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php b/tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php
similarity index 100%
rename from validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php
rename to tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php
diff --git a/validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json b/tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
rename to tests/Validation/cases/anonymousClassMembersShouldNotBeSymbols.php.expected.json
diff --git a/validation/frameworks/_cases/arrayValueShouldBeBoolean.php b/tests/Validation/cases/arrayValueShouldBeBoolean.php
similarity index 100%
rename from validation/frameworks/_cases/arrayValueShouldBeBoolean.php
rename to tests/Validation/cases/arrayValueShouldBeBoolean.php
diff --git a/validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json b/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/arrayValueShouldBeBoolean.php.expected.json
rename to tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json
diff --git a/validation/frameworks/_cases/caseStatement1.php b/tests/Validation/cases/caseStatement1.php
similarity index 100%
rename from validation/frameworks/_cases/caseStatement1.php
rename to tests/Validation/cases/caseStatement1.php
diff --git a/validation/frameworks/_cases/caseStatement1.php.expected.json b/tests/Validation/cases/caseStatement1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/caseStatement1.php.expected.json
rename to tests/Validation/cases/caseStatement1.php.expected.json
diff --git a/validation/frameworks/_cases/classDefinition1.php b/tests/Validation/cases/classDefinition1.php
similarity index 100%
rename from validation/frameworks/_cases/classDefinition1.php
rename to tests/Validation/cases/classDefinition1.php
diff --git a/validation/frameworks/_cases/classDefinition1.php.expected.json b/tests/Validation/cases/classDefinition1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/classDefinition1.php.expected.json
rename to tests/Validation/cases/classDefinition1.php.expected.json
diff --git a/validation/frameworks/_cases/classProperty1.php b/tests/Validation/cases/classProperty1.php
similarity index 100%
rename from validation/frameworks/_cases/classProperty1.php
rename to tests/Validation/cases/classProperty1.php
diff --git a/validation/frameworks/_cases/classProperty1.php.expected.json b/tests/Validation/cases/classProperty1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/classProperty1.php.expected.json
rename to tests/Validation/cases/classProperty1.php.expected.json
diff --git a/validation/frameworks/_cases/constants.php b/tests/Validation/cases/constants.php
similarity index 100%
rename from validation/frameworks/_cases/constants.php
rename to tests/Validation/cases/constants.php
diff --git a/validation/frameworks/_cases/constants.php.expected.json b/tests/Validation/cases/constants.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/constants.php.expected.json
rename to tests/Validation/cases/constants.php.expected.json
diff --git a/validation/frameworks/_cases/constants2.php b/tests/Validation/cases/constants2.php
similarity index 100%
rename from validation/frameworks/_cases/constants2.php
rename to tests/Validation/cases/constants2.php
diff --git a/validation/frameworks/_cases/constants2.php.expected.json b/tests/Validation/cases/constants2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/constants2.php.expected.json
rename to tests/Validation/cases/constants2.php.expected.json
diff --git a/validation/frameworks/_cases/constants3.php b/tests/Validation/cases/constants3.php
similarity index 100%
rename from validation/frameworks/_cases/constants3.php
rename to tests/Validation/cases/constants3.php
diff --git a/validation/frameworks/_cases/constants3.php.expected.json b/tests/Validation/cases/constants3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/constants3.php.expected.json
rename to tests/Validation/cases/constants3.php.expected.json
diff --git a/validation/frameworks/_cases/constants4.php b/tests/Validation/cases/constants4.php
similarity index 100%
rename from validation/frameworks/_cases/constants4.php
rename to tests/Validation/cases/constants4.php
diff --git a/validation/frameworks/_cases/constants4.php.expected.json b/tests/Validation/cases/constants4.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/constants4.php.expected.json
rename to tests/Validation/cases/constants4.php.expected.json
diff --git a/validation/frameworks/_cases/constants5.php b/tests/Validation/cases/constants5.php
similarity index 100%
rename from validation/frameworks/_cases/constants5.php
rename to tests/Validation/cases/constants5.php
diff --git a/validation/frameworks/_cases/constants5.php.expected.json b/tests/Validation/cases/constants5.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/constants5.php.expected.json
rename to tests/Validation/cases/constants5.php.expected.json
diff --git a/validation/frameworks/_cases/constantsInFunctionParamDefault.php b/tests/Validation/cases/constantsInFunctionParamDefault.php
similarity index 100%
rename from validation/frameworks/_cases/constantsInFunctionParamDefault.php
rename to tests/Validation/cases/constantsInFunctionParamDefault.php
diff --git a/validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json b/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/constantsInFunctionParamDefault.php.expected.json
rename to tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json
diff --git a/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php b/tests/Validation/cases/docBlocksOnNamespaceDefinition.php
similarity index 100%
rename from validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php
rename to tests/Validation/cases/docBlocksOnNamespaceDefinition.php
diff --git a/validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json b/tests/Validation/cases/docBlocksOnNamespaceDefinition.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/docBlocksOnNamespaceDefinition.php.expected.json
rename to tests/Validation/cases/docBlocksOnNamespaceDefinition.php.expected.json
diff --git a/validation/frameworks/_cases/exceptions1.php b/tests/Validation/cases/exceptions1.php
similarity index 100%
rename from validation/frameworks/_cases/exceptions1.php
rename to tests/Validation/cases/exceptions1.php
diff --git a/validation/frameworks/_cases/exceptions1.php.expected.json b/tests/Validation/cases/exceptions1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/exceptions1.php.expected.json
rename to tests/Validation/cases/exceptions1.php.expected.json
diff --git a/validation/frameworks/_cases/forLoopReference1.php b/tests/Validation/cases/forLoopReference1.php
similarity index 100%
rename from validation/frameworks/_cases/forLoopReference1.php
rename to tests/Validation/cases/forLoopReference1.php
diff --git a/validation/frameworks/_cases/forLoopReference1.php.expected.json b/tests/Validation/cases/forLoopReference1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/forLoopReference1.php.expected.json
rename to tests/Validation/cases/forLoopReference1.php.expected.json
diff --git a/validation/frameworks/_cases/functionUse.php b/tests/Validation/cases/functionUse.php
similarity index 100%
rename from validation/frameworks/_cases/functionUse.php
rename to tests/Validation/cases/functionUse.php
diff --git a/validation/frameworks/_cases/functionUse.php.expected.json b/tests/Validation/cases/functionUse.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/functionUse.php.expected.json
rename to tests/Validation/cases/functionUse.php.expected.json
diff --git a/validation/frameworks/_cases/functionUse2.php b/tests/Validation/cases/functionUse2.php
similarity index 100%
rename from validation/frameworks/_cases/functionUse2.php
rename to tests/Validation/cases/functionUse2.php
diff --git a/validation/frameworks/_cases/functionUse2.php.expected.json b/tests/Validation/cases/functionUse2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/functionUse2.php.expected.json
rename to tests/Validation/cases/functionUse2.php.expected.json
diff --git a/validation/frameworks/_cases/ifStatement1.php b/tests/Validation/cases/ifStatement1.php
similarity index 100%
rename from validation/frameworks/_cases/ifStatement1.php
rename to tests/Validation/cases/ifStatement1.php
diff --git a/validation/frameworks/_cases/ifStatement1.php.expected.json b/tests/Validation/cases/ifStatement1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/ifStatement1.php.expected.json
rename to tests/Validation/cases/ifStatement1.php.expected.json
diff --git a/validation/frameworks/_cases/interfaceProperty.php b/tests/Validation/cases/interfaceProperty.php
similarity index 100%
rename from validation/frameworks/_cases/interfaceProperty.php
rename to tests/Validation/cases/interfaceProperty.php
diff --git a/validation/frameworks/_cases/interfaceProperty.php.expected.json b/tests/Validation/cases/interfaceProperty.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/interfaceProperty.php.expected.json
rename to tests/Validation/cases/interfaceProperty.php.expected.json
diff --git a/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php b/tests/Validation/cases/magicConstantsShouldBeGlobal.php
similarity index 100%
rename from validation/frameworks/_cases/magicConstantsShouldBeGlobal.php
rename to tests/Validation/cases/magicConstantsShouldBeGlobal.php
diff --git a/validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json b/tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/magicConstantsShouldBeGlobal.php.expected.json
rename to tests/Validation/cases/magicConstantsShouldBeGlobal.php.expected.json
diff --git a/validation/frameworks/_cases/magicConsts.php b/tests/Validation/cases/magicConsts.php
similarity index 100%
rename from validation/frameworks/_cases/magicConsts.php
rename to tests/Validation/cases/magicConsts.php
diff --git a/validation/frameworks/_cases/magicConsts.php.expected.json b/tests/Validation/cases/magicConsts.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/magicConsts.php.expected.json
rename to tests/Validation/cases/magicConsts.php.expected.json
diff --git a/validation/frameworks/_cases/memberAccess1.php b/tests/Validation/cases/memberAccess1.php
similarity index 100%
rename from validation/frameworks/_cases/memberAccess1.php
rename to tests/Validation/cases/memberAccess1.php
diff --git a/validation/frameworks/_cases/memberAccess1.php.expected.json b/tests/Validation/cases/memberAccess1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/memberAccess1.php.expected.json
rename to tests/Validation/cases/memberAccess1.php.expected.json
diff --git a/validation/frameworks/_cases/memberAccess2.php b/tests/Validation/cases/memberAccess2.php
similarity index 100%
rename from validation/frameworks/_cases/memberAccess2.php
rename to tests/Validation/cases/memberAccess2.php
diff --git a/validation/frameworks/_cases/memberAccess2.php.expected.json b/tests/Validation/cases/memberAccess2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/memberAccess2.php.expected.json
rename to tests/Validation/cases/memberAccess2.php.expected.json
diff --git a/validation/frameworks/_cases/memberAccess3.php b/tests/Validation/cases/memberAccess3.php
similarity index 100%
rename from validation/frameworks/_cases/memberAccess3.php
rename to tests/Validation/cases/memberAccess3.php
diff --git a/validation/frameworks/_cases/memberAccess3.php.expected.json b/tests/Validation/cases/memberAccess3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/memberAccess3.php.expected.json
rename to tests/Validation/cases/memberAccess3.php.expected.json
diff --git a/validation/frameworks/_cases/memberAccess4.php b/tests/Validation/cases/memberAccess4.php
similarity index 100%
rename from validation/frameworks/_cases/memberAccess4.php
rename to tests/Validation/cases/memberAccess4.php
diff --git a/validation/frameworks/_cases/memberAccess4.php.expected.json b/tests/Validation/cases/memberAccess4.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/memberAccess4.php.expected.json
rename to tests/Validation/cases/memberAccess4.php.expected.json
diff --git a/validation/frameworks/_cases/memberAccess5.php b/tests/Validation/cases/memberAccess5.php
similarity index 100%
rename from validation/frameworks/_cases/memberAccess5.php
rename to tests/Validation/cases/memberAccess5.php
diff --git a/validation/frameworks/_cases/memberAccess5.php.expected.json b/tests/Validation/cases/memberAccess5.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/memberAccess5.php.expected.json
rename to tests/Validation/cases/memberAccess5.php.expected.json
diff --git a/validation/frameworks/_cases/memberCall1.php b/tests/Validation/cases/memberCall1.php
similarity index 100%
rename from validation/frameworks/_cases/memberCall1.php
rename to tests/Validation/cases/memberCall1.php
diff --git a/validation/frameworks/_cases/memberCall1.php.expected.json b/tests/Validation/cases/memberCall1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/memberCall1.php.expected.json
rename to tests/Validation/cases/memberCall1.php.expected.json
diff --git a/validation/frameworks/_cases/multipleNamespaces.php b/tests/Validation/cases/multipleNamespaces.php
similarity index 100%
rename from validation/frameworks/_cases/multipleNamespaces.php
rename to tests/Validation/cases/multipleNamespaces.php
diff --git a/validation/frameworks/_cases/multipleNamespaces.php.expected.json b/tests/Validation/cases/multipleNamespaces.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/multipleNamespaces.php.expected.json
rename to tests/Validation/cases/multipleNamespaces.php.expected.json
diff --git a/validation/frameworks/_cases/multiplePreceedingComments.php b/tests/Validation/cases/multiplePreceedingComments.php
similarity index 100%
rename from validation/frameworks/_cases/multiplePreceedingComments.php
rename to tests/Validation/cases/multiplePreceedingComments.php
diff --git a/validation/frameworks/_cases/multiplePreceedingComments.php.expected.json b/tests/Validation/cases/multiplePreceedingComments.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/multiplePreceedingComments.php.expected.json
rename to tests/Validation/cases/multiplePreceedingComments.php.expected.json
diff --git a/validation/frameworks/_cases/nameToken.php b/tests/Validation/cases/nameToken.php
similarity index 100%
rename from validation/frameworks/_cases/nameToken.php
rename to tests/Validation/cases/nameToken.php
diff --git a/validation/frameworks/_cases/nameToken.php.expected.json b/tests/Validation/cases/nameToken.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/nameToken.php.expected.json
rename to tests/Validation/cases/nameToken.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces2.php b/tests/Validation/cases/namespaces2.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces2.php
rename to tests/Validation/cases/namespaces2.php
diff --git a/validation/frameworks/_cases/namespaces2.php.expected.json b/tests/Validation/cases/namespaces2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces2.php.expected.json
rename to tests/Validation/cases/namespaces2.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces3.php b/tests/Validation/cases/namespaces3.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces3.php
rename to tests/Validation/cases/namespaces3.php
diff --git a/validation/frameworks/_cases/namespaces3.php.expected.json b/tests/Validation/cases/namespaces3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces3.php.expected.json
rename to tests/Validation/cases/namespaces3.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces4.php b/tests/Validation/cases/namespaces4.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces4.php
rename to tests/Validation/cases/namespaces4.php
diff --git a/validation/frameworks/_cases/namespaces4.php.expected.json b/tests/Validation/cases/namespaces4.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces4.php.expected.json
rename to tests/Validation/cases/namespaces4.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces5.php b/tests/Validation/cases/namespaces5.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces5.php
rename to tests/Validation/cases/namespaces5.php
diff --git a/validation/frameworks/_cases/namespaces5.php.expected.json b/tests/Validation/cases/namespaces5.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces5.php.expected.json
rename to tests/Validation/cases/namespaces5.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces6.php b/tests/Validation/cases/namespaces6.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces6.php
rename to tests/Validation/cases/namespaces6.php
diff --git a/validation/frameworks/_cases/namespaces6.php.expected.json b/tests/Validation/cases/namespaces6.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces6.php.expected.json
rename to tests/Validation/cases/namespaces6.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces7.php b/tests/Validation/cases/namespaces7.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces7.php
rename to tests/Validation/cases/namespaces7.php
diff --git a/validation/frameworks/_cases/namespaces7.php.expected.json b/tests/Validation/cases/namespaces7.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces7.php.expected.json
rename to tests/Validation/cases/namespaces7.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces8.php b/tests/Validation/cases/namespaces8.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces8.php
rename to tests/Validation/cases/namespaces8.php
diff --git a/validation/frameworks/_cases/namespaces8.php.expected.json b/tests/Validation/cases/namespaces8.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces8.php.expected.json
rename to tests/Validation/cases/namespaces8.php.expected.json
diff --git a/validation/frameworks/_cases/namespaces9.php b/tests/Validation/cases/namespaces9.php
similarity index 100%
rename from validation/frameworks/_cases/namespaces9.php
rename to tests/Validation/cases/namespaces9.php
diff --git a/validation/frameworks/_cases/namespaces9.php.expected.json b/tests/Validation/cases/namespaces9.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/namespaces9.php.expected.json
rename to tests/Validation/cases/namespaces9.php.expected.json
diff --git a/validation/frameworks/_cases/newStatic.php b/tests/Validation/cases/newStatic.php
similarity index 100%
rename from validation/frameworks/_cases/newStatic.php
rename to tests/Validation/cases/newStatic.php
diff --git a/validation/frameworks/_cases/newStatic.php.expected.json b/tests/Validation/cases/newStatic.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/newStatic.php.expected.json
rename to tests/Validation/cases/newStatic.php.expected.json
diff --git a/validation/frameworks/_cases/objectCreation.php b/tests/Validation/cases/objectCreation.php
similarity index 100%
rename from validation/frameworks/_cases/objectCreation.php
rename to tests/Validation/cases/objectCreation.php
diff --git a/validation/frameworks/_cases/objectCreation.php.expected.json b/tests/Validation/cases/objectCreation.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/objectCreation.php.expected.json
rename to tests/Validation/cases/objectCreation.php.expected.json
diff --git a/validation/frameworks/_cases/objectCreation2.php b/tests/Validation/cases/objectCreation2.php
similarity index 100%
rename from validation/frameworks/_cases/objectCreation2.php
rename to tests/Validation/cases/objectCreation2.php
diff --git a/validation/frameworks/_cases/objectCreation2.php.expected.json b/tests/Validation/cases/objectCreation2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/objectCreation2.php.expected.json
rename to tests/Validation/cases/objectCreation2.php.expected.json
diff --git a/validation/frameworks/_cases/objectCreation3.php b/tests/Validation/cases/objectCreation3.php
similarity index 100%
rename from validation/frameworks/_cases/objectCreation3.php
rename to tests/Validation/cases/objectCreation3.php
diff --git a/validation/frameworks/_cases/objectCreation3.php.expected.json b/tests/Validation/cases/objectCreation3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/objectCreation3.php.expected.json
rename to tests/Validation/cases/objectCreation3.php.expected.json
diff --git a/validation/frameworks/_cases/param1.php b/tests/Validation/cases/param1.php
similarity index 100%
rename from validation/frameworks/_cases/param1.php
rename to tests/Validation/cases/param1.php
diff --git a/validation/frameworks/_cases/param1.php.expected.json b/tests/Validation/cases/param1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/param1.php.expected.json
rename to tests/Validation/cases/param1.php.expected.json
diff --git a/validation/frameworks/_cases/parameterTypeResolution1.php b/tests/Validation/cases/parameterTypeResolution1.php
similarity index 100%
rename from validation/frameworks/_cases/parameterTypeResolution1.php
rename to tests/Validation/cases/parameterTypeResolution1.php
diff --git a/validation/frameworks/_cases/parameterTypeResolution1.php.expected.json b/tests/Validation/cases/parameterTypeResolution1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/parameterTypeResolution1.php.expected.json
rename to tests/Validation/cases/parameterTypeResolution1.php.expected.json
diff --git a/validation/frameworks/_cases/parent1.php b/tests/Validation/cases/parent1.php
similarity index 100%
rename from validation/frameworks/_cases/parent1.php
rename to tests/Validation/cases/parent1.php
diff --git a/validation/frameworks/_cases/parent1.php.expected.json b/tests/Validation/cases/parent1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/parent1.php.expected.json
rename to tests/Validation/cases/parent1.php.expected.json
diff --git a/validation/frameworks/_cases/parent2.php b/tests/Validation/cases/parent2.php
similarity index 100%
rename from validation/frameworks/_cases/parent2.php
rename to tests/Validation/cases/parent2.php
diff --git a/validation/frameworks/_cases/parent2.php.expected.json b/tests/Validation/cases/parent2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/parent2.php.expected.json
rename to tests/Validation/cases/parent2.php.expected.json
diff --git a/validation/frameworks/_cases/parent3.php b/tests/Validation/cases/parent3.php
similarity index 100%
rename from validation/frameworks/_cases/parent3.php
rename to tests/Validation/cases/parent3.php
diff --git a/validation/frameworks/_cases/parent3.php.expected.json b/tests/Validation/cases/parent3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/parent3.php.expected.json
rename to tests/Validation/cases/parent3.php.expected.json
diff --git a/validation/frameworks/_cases/propertyName1.php b/tests/Validation/cases/propertyName1.php
similarity index 100%
rename from validation/frameworks/_cases/propertyName1.php
rename to tests/Validation/cases/propertyName1.php
diff --git a/validation/frameworks/_cases/propertyName1.php.expected.json b/tests/Validation/cases/propertyName1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/propertyName1.php.expected.json
rename to tests/Validation/cases/propertyName1.php.expected.json
diff --git a/validation/frameworks/_cases/propertyName2.php b/tests/Validation/cases/propertyName2.php
similarity index 100%
rename from validation/frameworks/_cases/propertyName2.php
rename to tests/Validation/cases/propertyName2.php
diff --git a/validation/frameworks/_cases/propertyName2.php.expected.json b/tests/Validation/cases/propertyName2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/propertyName2.php.expected.json
rename to tests/Validation/cases/propertyName2.php.expected.json
diff --git a/validation/frameworks/_cases/returnType.php b/tests/Validation/cases/returnType.php
similarity index 100%
rename from validation/frameworks/_cases/returnType.php
rename to tests/Validation/cases/returnType.php
diff --git a/validation/frameworks/_cases/returnType.php.expected.json b/tests/Validation/cases/returnType.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/returnType.php.expected.json
rename to tests/Validation/cases/returnType.php.expected.json
diff --git a/validation/frameworks/_cases/scopedPropertyAccess.php b/tests/Validation/cases/scopedPropertyAccess.php
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess.php
rename to tests/Validation/cases/scopedPropertyAccess.php
diff --git a/validation/frameworks/_cases/scopedPropertyAccess.php.expected.json b/tests/Validation/cases/scopedPropertyAccess.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess.php.expected.json
rename to tests/Validation/cases/scopedPropertyAccess.php.expected.json
diff --git a/validation/frameworks/_cases/scopedPropertyAccess2.php b/tests/Validation/cases/scopedPropertyAccess2.php
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess2.php
rename to tests/Validation/cases/scopedPropertyAccess2.php
diff --git a/validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json b/tests/Validation/cases/scopedPropertyAccess2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess2.php.expected.json
rename to tests/Validation/cases/scopedPropertyAccess2.php.expected.json
diff --git a/validation/frameworks/_cases/scopedPropertyAccess3.php b/tests/Validation/cases/scopedPropertyAccess3.php
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess3.php
rename to tests/Validation/cases/scopedPropertyAccess3.php
diff --git a/validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json b/tests/Validation/cases/scopedPropertyAccess3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess3.php.expected.json
rename to tests/Validation/cases/scopedPropertyAccess3.php.expected.json
diff --git a/validation/frameworks/_cases/scopedPropertyAccess4.php b/tests/Validation/cases/scopedPropertyAccess4.php
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess4.php
rename to tests/Validation/cases/scopedPropertyAccess4.php
diff --git a/validation/frameworks/_cases/scopedPropertyAccess4.php.expected.json b/tests/Validation/cases/scopedPropertyAccess4.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess4.php.expected.json
rename to tests/Validation/cases/scopedPropertyAccess4.php.expected.json
diff --git a/validation/frameworks/_cases/scopedPropertyAccess5.php b/tests/Validation/cases/scopedPropertyAccess5.php
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess5.php
rename to tests/Validation/cases/scopedPropertyAccess5.php
diff --git a/validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json b/tests/Validation/cases/scopedPropertyAccess5.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/scopedPropertyAccess5.php.expected.json
rename to tests/Validation/cases/scopedPropertyAccess5.php.expected.json
diff --git a/validation/frameworks/_cases/self1.php b/tests/Validation/cases/self1.php
similarity index 100%
rename from validation/frameworks/_cases/self1.php
rename to tests/Validation/cases/self1.php
diff --git a/validation/frameworks/_cases/self1.php.expected.json b/tests/Validation/cases/self1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/self1.php.expected.json
rename to tests/Validation/cases/self1.php.expected.json
diff --git a/validation/frameworks/_cases/self2.php b/tests/Validation/cases/self2.php
similarity index 100%
rename from validation/frameworks/_cases/self2.php
rename to tests/Validation/cases/self2.php
diff --git a/validation/frameworks/_cases/self2.php.expected.json b/tests/Validation/cases/self2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/self2.php.expected.json
rename to tests/Validation/cases/self2.php.expected.json
diff --git a/validation/frameworks/_cases/self3.php b/tests/Validation/cases/self3.php
similarity index 100%
rename from validation/frameworks/_cases/self3.php
rename to tests/Validation/cases/self3.php
diff --git a/validation/frameworks/_cases/self3.php.expected.json b/tests/Validation/cases/self3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/self3.php.expected.json
rename to tests/Validation/cases/self3.php.expected.json
diff --git a/validation/frameworks/_cases/self4.php b/tests/Validation/cases/self4.php
similarity index 100%
rename from validation/frameworks/_cases/self4.php
rename to tests/Validation/cases/self4.php
diff --git a/validation/frameworks/_cases/self4.php.expected.json b/tests/Validation/cases/self4.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/self4.php.expected.json
rename to tests/Validation/cases/self4.php.expected.json
diff --git a/validation/frameworks/_cases/self5.php b/tests/Validation/cases/self5.php
similarity index 100%
rename from validation/frameworks/_cases/self5.php
rename to tests/Validation/cases/self5.php
diff --git a/validation/frameworks/_cases/self5.php.expected.json b/tests/Validation/cases/self5.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/self5.php.expected.json
rename to tests/Validation/cases/self5.php.expected.json
diff --git a/validation/frameworks/_cases/static1.php b/tests/Validation/cases/static1.php
similarity index 100%
rename from validation/frameworks/_cases/static1.php
rename to tests/Validation/cases/static1.php
diff --git a/validation/frameworks/_cases/static1.php.expected.json b/tests/Validation/cases/static1.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/static1.php.expected.json
rename to tests/Validation/cases/static1.php.expected.json
diff --git a/validation/frameworks/_cases/static2.php b/tests/Validation/cases/static2.php
similarity index 100%
rename from validation/frameworks/_cases/static2.php
rename to tests/Validation/cases/static2.php
diff --git a/validation/frameworks/_cases/static2.php.expected.json b/tests/Validation/cases/static2.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/static2.php.expected.json
rename to tests/Validation/cases/static2.php.expected.json
diff --git a/validation/frameworks/_cases/static3.php b/tests/Validation/cases/static3.php
similarity index 100%
rename from validation/frameworks/_cases/static3.php
rename to tests/Validation/cases/static3.php
diff --git a/validation/frameworks/_cases/static3.php.expected.json b/tests/Validation/cases/static3.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/static3.php.expected.json
rename to tests/Validation/cases/static3.php.expected.json
diff --git a/validation/frameworks/_cases/static4.php b/tests/Validation/cases/static4.php
similarity index 100%
rename from validation/frameworks/_cases/static4.php
rename to tests/Validation/cases/static4.php
diff --git a/validation/frameworks/_cases/static4.php.expected.json b/tests/Validation/cases/static4.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/static4.php.expected.json
rename to tests/Validation/cases/static4.php.expected.json
diff --git a/validation/frameworks/_cases/staticInArray.php b/tests/Validation/cases/staticInArray.php
similarity index 100%
rename from validation/frameworks/_cases/staticInArray.php
rename to tests/Validation/cases/staticInArray.php
diff --git a/validation/frameworks/_cases/staticInArray.php.expected.json b/tests/Validation/cases/staticInArray.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/staticInArray.php.expected.json
rename to tests/Validation/cases/staticInArray.php.expected.json
diff --git a/validation/frameworks/_cases/stringVariable.php b/tests/Validation/cases/stringVariable.php
similarity index 100%
rename from validation/frameworks/_cases/stringVariable.php
rename to tests/Validation/cases/stringVariable.php
diff --git a/validation/frameworks/_cases/stringVariable.php.expected.json b/tests/Validation/cases/stringVariable.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/stringVariable.php.expected.json
rename to tests/Validation/cases/stringVariable.php.expected.json
diff --git a/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php b/tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php
similarity index 100%
rename from validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php
rename to tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php
diff --git a/validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json b/tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/testQualifiedNameOutsideOfNamespace.php.expected.json
rename to tests/Validation/cases/testQualifiedNameOutsideOfNamespace.php.expected.json
diff --git a/validation/frameworks/_cases/verifyFqsenOnClassProperty.php b/tests/Validation/cases/verifyFqsenOnClassProperty.php
similarity index 100%
rename from validation/frameworks/_cases/verifyFqsenOnClassProperty.php
rename to tests/Validation/cases/verifyFqsenOnClassProperty.php
diff --git a/validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json b/tests/Validation/cases/verifyFqsenOnClassProperty.php.expected.json
similarity index 100%
rename from validation/frameworks/_cases/verifyFqsenOnClassProperty.php.expected.json
rename to tests/Validation/cases/verifyFqsenOnClassProperty.php.expected.json