diff --git a/data/fixtures/scopes/c/argument.actual.iteration.scope b/data/fixtures/scopes/c/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.actual.iteration.scope
rename to data/fixtures/scopes/c/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/c/argument.actual.method.iteration.scope b/data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.actual.method.iteration.scope
rename to data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope
diff --git a/data/fixtures/scopes/c/argument.actual.method.multiLine.scope b/data/fixtures/scopes/c/argument/argument.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.actual.method.multiLine.scope
rename to data/fixtures/scopes/c/argument/argument.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/c/argument.actual.method.singleLine.scope b/data/fixtures/scopes/c/argument/argument.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.actual.method.singleLine.scope
rename to data/fixtures/scopes/c/argument/argument.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/c/argument.actual.multiLine.scope b/data/fixtures/scopes/c/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.actual.multiLine.scope
rename to data/fixtures/scopes/c/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/c/argument.actual.singleLine.scope b/data/fixtures/scopes/c/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.actual.singleLine.scope
rename to data/fixtures/scopes/c/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/c/argument.formal.iteration.scope b/data/fixtures/scopes/c/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.formal.iteration.scope
rename to data/fixtures/scopes/c/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/c/argument.formal.multiLine.scope b/data/fixtures/scopes/c/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.formal.multiLine.scope
rename to data/fixtures/scopes/c/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/c/argument.formal.singleLine.scope b/data/fixtures/scopes/c/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argument.formal.singleLine.scope
rename to data/fixtures/scopes/c/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/c/argumentList.actual.empty.scope b/data/fixtures/scopes/c/argumentList/argumentList.actual.empty.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.actual.empty.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.actual.empty.scope
diff --git a/data/fixtures/scopes/c/argumentList.actual.method.empty.scope b/data/fixtures/scopes/c/argumentList/argumentList.actual.method.empty.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.actual.method.empty.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.actual.method.empty.scope
diff --git a/data/fixtures/scopes/c/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/c/argumentList/argumentList.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.actual.method.multiLine.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/c/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/c/argumentList/argumentList.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.actual.method.singleLine.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/c/argumentList.actual.multiLine.scope b/data/fixtures/scopes/c/argumentList/argumentList.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.actual.multiLine.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.actual.multiLine.scope
diff --git a/data/fixtures/scopes/c/argumentList.actual.singleLine.scope b/data/fixtures/scopes/c/argumentList/argumentList.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.actual.singleLine.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.actual.singleLine.scope
diff --git a/data/fixtures/scopes/c/argumentList.formal.empty.scope b/data/fixtures/scopes/c/argumentList/argumentList.formal.empty.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.formal.empty.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.formal.empty.scope
diff --git a/data/fixtures/scopes/c/argumentList.formal.multiLine.scope b/data/fixtures/scopes/c/argumentList/argumentList.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.formal.multiLine.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.formal.multiLine.scope
diff --git a/data/fixtures/scopes/c/argumentList.formal.singleLine.scope b/data/fixtures/scopes/c/argumentList/argumentList.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/c/argumentList.formal.singleLine.scope
rename to data/fixtures/scopes/c/argumentList/argumentList.formal.singleLine.scope
diff --git a/data/fixtures/scopes/c/branch.if.elif.else.scope b/data/fixtures/scopes/c/branch/branch.if.elif.else.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.if.elif.else.scope
rename to data/fixtures/scopes/c/branch/branch.if.elif.else.scope
diff --git a/data/fixtures/scopes/c/branch.if.else.scope b/data/fixtures/scopes/c/branch/branch.if.else.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.if.else.scope
rename to data/fixtures/scopes/c/branch/branch.if.else.scope
diff --git a/data/fixtures/scopes/c/branch.if.iteration.scope b/data/fixtures/scopes/c/branch/branch.if.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.if.iteration.scope
rename to data/fixtures/scopes/c/branch/branch.if.iteration.scope
diff --git a/data/fixtures/scopes/c/branch.if.scope b/data/fixtures/scopes/c/branch/branch.if.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.if.scope
rename to data/fixtures/scopes/c/branch/branch.if.scope
diff --git a/data/fixtures/scopes/c/branch.switchCase.iteration.scope b/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.switchCase.iteration.scope
rename to data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/c/branch.switchCase.scope b/data/fixtures/scopes/c/branch/branch.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.switchCase.scope
rename to data/fixtures/scopes/c/branch/branch.switchCase.scope
diff --git a/data/fixtures/scopes/c/branch.ternary.iteration.scope b/data/fixtures/scopes/c/branch/branch.ternary.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.ternary.iteration.scope
rename to data/fixtures/scopes/c/branch/branch.ternary.iteration.scope
diff --git a/data/fixtures/scopes/c/branch.ternary.scope b/data/fixtures/scopes/c/branch/branch.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/c/branch.ternary.scope
rename to data/fixtures/scopes/c/branch/branch.ternary.scope
diff --git a/data/fixtures/scopes/c/class.iteration.document.scope b/data/fixtures/scopes/c/class/class.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/c/class.iteration.document.scope
rename to data/fixtures/scopes/c/class/class.iteration.document.scope
diff --git a/data/fixtures/scopes/c/class.scope b/data/fixtures/scopes/c/class/class.scope
similarity index 100%
rename from data/fixtures/scopes/c/class.scope
rename to data/fixtures/scopes/c/class/class.scope
diff --git a/data/fixtures/scopes/c/class2.scope b/data/fixtures/scopes/c/class/class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/class2.scope
rename to data/fixtures/scopes/c/class/class2.scope
diff --git a/data/fixtures/scopes/c/class3.scope b/data/fixtures/scopes/c/class/class3.scope
similarity index 100%
rename from data/fixtures/scopes/c/class3.scope
rename to data/fixtures/scopes/c/class/class3.scope
diff --git a/data/fixtures/scopes/c/class4.scope b/data/fixtures/scopes/c/class/class4.scope
similarity index 100%
rename from data/fixtures/scopes/c/class4.scope
rename to data/fixtures/scopes/c/class/class4.scope
diff --git a/data/fixtures/scopes/c/class5.scope b/data/fixtures/scopes/c/class/class5.scope
similarity index 100%
rename from data/fixtures/scopes/c/class5.scope
rename to data/fixtures/scopes/c/class/class5.scope
diff --git a/data/fixtures/scopes/c/class6.scope b/data/fixtures/scopes/c/class/class6.scope
similarity index 100%
rename from data/fixtures/scopes/c/class6.scope
rename to data/fixtures/scopes/c/class/class6.scope
diff --git a/data/fixtures/scopes/c/condition.doWhile.scope b/data/fixtures/scopes/c/condition/condition.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.doWhile.scope
rename to data/fixtures/scopes/c/condition/condition.doWhile.scope
diff --git a/data/fixtures/scopes/c/condition.for.scope b/data/fixtures/scopes/c/condition/condition.for.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.for.scope
rename to data/fixtures/scopes/c/condition/condition.for.scope
diff --git a/data/fixtures/scopes/c/condition.if.scope b/data/fixtures/scopes/c/condition/condition.if.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.if.scope
rename to data/fixtures/scopes/c/condition/condition.if.scope
diff --git a/data/fixtures/scopes/c/condition.switchCase.iteration.scope b/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.switchCase.iteration.scope
rename to data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/c/condition.switchCase.scope b/data/fixtures/scopes/c/condition/condition.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.switchCase.scope
rename to data/fixtures/scopes/c/condition/condition.switchCase.scope
diff --git a/data/fixtures/scopes/c/condition.ternary.scope b/data/fixtures/scopes/c/condition/condition.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.ternary.scope
rename to data/fixtures/scopes/c/condition/condition.ternary.scope
diff --git a/data/fixtures/scopes/c/condition.while.scope b/data/fixtures/scopes/c/condition/condition.while.scope
similarity index 100%
rename from data/fixtures/scopes/c/condition.while.scope
rename to data/fixtures/scopes/c/condition/condition.while.scope
diff --git a/data/fixtures/scopes/c/functionName.iteration.document.scope b/data/fixtures/scopes/c/functionName/functionName.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/c/functionName.iteration.document.scope
rename to data/fixtures/scopes/c/functionName/functionName.iteration.document.scope
diff --git a/data/fixtures/scopes/c/functionName.scope b/data/fixtures/scopes/c/functionName/functionName.scope
similarity index 100%
rename from data/fixtures/scopes/c/functionName.scope
rename to data/fixtures/scopes/c/functionName/functionName.scope
diff --git a/data/fixtures/scopes/c/functionName2.scope b/data/fixtures/scopes/c/functionName/functionName2.scope
similarity index 100%
rename from data/fixtures/scopes/c/functionName2.scope
rename to data/fixtures/scopes/c/functionName/functionName2.scope
diff --git a/data/fixtures/scopes/c/functionName3.scope b/data/fixtures/scopes/c/functionName/functionName3.scope
similarity index 100%
rename from data/fixtures/scopes/c/functionName3.scope
rename to data/fixtures/scopes/c/functionName/functionName3.scope
diff --git a/data/fixtures/scopes/c/functionName4.scope b/data/fixtures/scopes/c/functionName/functionName4.scope
similarity index 100%
rename from data/fixtures/scopes/c/functionName4.scope
rename to data/fixtures/scopes/c/functionName/functionName4.scope
diff --git a/data/fixtures/scopes/c/interior.class.scope b/data/fixtures/scopes/c/interior/interior.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.class.scope
rename to data/fixtures/scopes/c/interior/interior.class.scope
diff --git a/data/fixtures/scopes/c/interior.class2.scope b/data/fixtures/scopes/c/interior/interior.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.class2.scope
rename to data/fixtures/scopes/c/interior/interior.class2.scope
diff --git a/data/fixtures/scopes/c/interior.class3.scope b/data/fixtures/scopes/c/interior/interior.class3.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.class3.scope
rename to data/fixtures/scopes/c/interior/interior.class3.scope
diff --git a/data/fixtures/scopes/c/interior.class4.scope b/data/fixtures/scopes/c/interior/interior.class4.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.class4.scope
rename to data/fixtures/scopes/c/interior/interior.class4.scope
diff --git a/data/fixtures/scopes/c/interior.class5.scope b/data/fixtures/scopes/c/interior/interior.class5.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.class5.scope
rename to data/fixtures/scopes/c/interior/interior.class5.scope
diff --git a/data/fixtures/scopes/c/interior.class6.scope b/data/fixtures/scopes/c/interior/interior.class6.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.class6.scope
rename to data/fixtures/scopes/c/interior/interior.class6.scope
diff --git a/data/fixtures/scopes/c/interior.doWhile.scope b/data/fixtures/scopes/c/interior/interior.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.doWhile.scope
rename to data/fixtures/scopes/c/interior/interior.doWhile.scope
diff --git a/data/fixtures/scopes/c/interior.for.scope b/data/fixtures/scopes/c/interior/interior.for.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.for.scope
rename to data/fixtures/scopes/c/interior/interior.for.scope
diff --git a/data/fixtures/scopes/c/interior.function.scope b/data/fixtures/scopes/c/interior/interior.function.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.function.scope
rename to data/fixtures/scopes/c/interior/interior.function.scope
diff --git a/data/fixtures/scopes/c/interior.function2.scope b/data/fixtures/scopes/c/interior/interior.function2.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.function2.scope
rename to data/fixtures/scopes/c/interior/interior.function2.scope
diff --git a/data/fixtures/scopes/c/interior.if.scope b/data/fixtures/scopes/c/interior/interior.if.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.if.scope
rename to data/fixtures/scopes/c/interior/interior.if.scope
diff --git a/data/fixtures/scopes/c/interior.switch.scope b/data/fixtures/scopes/c/interior/interior.switch.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.switch.scope
rename to data/fixtures/scopes/c/interior/interior.switch.scope
diff --git a/data/fixtures/scopes/c/interior.switchCase.scope b/data/fixtures/scopes/c/interior/interior.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.switchCase.scope
rename to data/fixtures/scopes/c/interior/interior.switchCase.scope
diff --git a/data/fixtures/scopes/c/interior.ternary.scope b/data/fixtures/scopes/c/interior/interior.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.ternary.scope
rename to data/fixtures/scopes/c/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/c/interior.while.scope b/data/fixtures/scopes/c/interior/interior.while.scope
similarity index 100%
rename from data/fixtures/scopes/c/interior.while.scope
rename to data/fixtures/scopes/c/interior/interior.while.scope
diff --git a/data/fixtures/scopes/c/name.argument.formal.iteration.scope b/data/fixtures/scopes/c/name/name.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.argument.formal.iteration.scope
rename to data/fixtures/scopes/c/name/name.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/c/name.argument.formal.iteration2.scope b/data/fixtures/scopes/c/name/name.argument.formal.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.argument.formal.iteration2.scope
rename to data/fixtures/scopes/c/name/name.argument.formal.iteration2.scope
diff --git a/data/fixtures/scopes/c/name.argument.formal.scope b/data/fixtures/scopes/c/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.argument.formal.scope
rename to data/fixtures/scopes/c/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/c/name.argument.formal2.scope b/data/fixtures/scopes/c/name/name.argument.formal2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.argument.formal2.scope
rename to data/fixtures/scopes/c/name/name.argument.formal2.scope
diff --git a/data/fixtures/scopes/c/name.assignment.scope b/data/fixtures/scopes/c/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.assignment.scope
rename to data/fixtures/scopes/c/name/name.assignment.scope
diff --git a/data/fixtures/scopes/c/name.assignment2.scope b/data/fixtures/scopes/c/name/name.assignment2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.assignment2.scope
rename to data/fixtures/scopes/c/name/name.assignment2.scope
diff --git a/data/fixtures/scopes/c/name.class.scope b/data/fixtures/scopes/c/name/name.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.class.scope
rename to data/fixtures/scopes/c/name/name.class.scope
diff --git a/data/fixtures/scopes/c/name.field.class.scope b/data/fixtures/scopes/c/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.field.class.scope
rename to data/fixtures/scopes/c/name/name.field.class.scope
diff --git a/data/fixtures/scopes/c/name.field.class2.scope b/data/fixtures/scopes/c/name/name.field.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.field.class2.scope
rename to data/fixtures/scopes/c/name/name.field.class2.scope
diff --git a/data/fixtures/scopes/c/name.field.class3.scope b/data/fixtures/scopes/c/name/name.field.class3.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.field.class3.scope
rename to data/fixtures/scopes/c/name/name.field.class3.scope
diff --git a/data/fixtures/scopes/c/name.function.scope b/data/fixtures/scopes/c/name/name.function.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.function.scope
rename to data/fixtures/scopes/c/name/name.function.scope
diff --git a/data/fixtures/scopes/c/name.function2.scope b/data/fixtures/scopes/c/name/name.function2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.function2.scope
rename to data/fixtures/scopes/c/name/name.function2.scope
diff --git a/data/fixtures/scopes/c/name.function3.scope b/data/fixtures/scopes/c/name/name.function3.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.function3.scope
rename to data/fixtures/scopes/c/name/name.function3.scope
diff --git a/data/fixtures/scopes/c/name.function4.scope b/data/fixtures/scopes/c/name/name.function4.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.function4.scope
rename to data/fixtures/scopes/c/name/name.function4.scope
diff --git a/data/fixtures/scopes/c/name.iteration.block2.scope b/data/fixtures/scopes/c/name/name.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.iteration.block2.scope
rename to data/fixtures/scopes/c/name/name.iteration.block2.scope
diff --git a/data/fixtures/scopes/c/name.iteration.block3.scope b/data/fixtures/scopes/c/name/name.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.iteration.block3.scope
rename to data/fixtures/scopes/c/name/name.iteration.block3.scope
diff --git a/data/fixtures/scopes/c/name.iteration.block4.scope b/data/fixtures/scopes/c/name/name.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.iteration.block4.scope
rename to data/fixtures/scopes/c/name/name.iteration.block4.scope
diff --git a/data/fixtures/scopes/c/name.iteration.class.scope b/data/fixtures/scopes/c/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.iteration.class.scope
rename to data/fixtures/scopes/c/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/c/name.iteration.class2.scope b/data/fixtures/scopes/c/name/name.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.iteration.class2.scope
rename to data/fixtures/scopes/c/name/name.iteration.class2.scope
diff --git a/data/fixtures/scopes/c/name.iteration.document.scope b/data/fixtures/scopes/c/name/name.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.iteration.document.scope
rename to data/fixtures/scopes/c/name/name.iteration.document.scope
diff --git a/data/fixtures/scopes/c/name.variable.scope b/data/fixtures/scopes/c/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/c/name.variable.scope
rename to data/fixtures/scopes/c/name/name.variable.scope
diff --git a/data/fixtures/scopes/c/statement.class.scope b/data/fixtures/scopes/c/statement/statement.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.class.scope
rename to data/fixtures/scopes/c/statement/statement.class.scope
diff --git a/data/fixtures/scopes/c/statement.field.class.scope b/data/fixtures/scopes/c/statement/statement.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.field.class.scope
rename to data/fixtures/scopes/c/statement/statement.field.class.scope
diff --git a/data/fixtures/scopes/c/statement.field.class2.scope b/data/fixtures/scopes/c/statement/statement.field.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.field.class2.scope
rename to data/fixtures/scopes/c/statement/statement.field.class2.scope
diff --git a/data/fixtures/scopes/c/statement.iteration.block2.scope b/data/fixtures/scopes/c/statement/statement.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.iteration.block2.scope
rename to data/fixtures/scopes/c/statement/statement.iteration.block2.scope
diff --git a/data/fixtures/scopes/c/statement.iteration.block3.scope b/data/fixtures/scopes/c/statement/statement.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.iteration.block3.scope
rename to data/fixtures/scopes/c/statement/statement.iteration.block3.scope
diff --git a/data/fixtures/scopes/c/statement.iteration.block4.scope b/data/fixtures/scopes/c/statement/statement.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.iteration.block4.scope
rename to data/fixtures/scopes/c/statement/statement.iteration.block4.scope
diff --git a/data/fixtures/scopes/c/statement.iteration.class.scope b/data/fixtures/scopes/c/statement/statement.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.iteration.class.scope
rename to data/fixtures/scopes/c/statement/statement.iteration.class.scope
diff --git a/data/fixtures/scopes/c/statement.iteration.class2.scope b/data/fixtures/scopes/c/statement/statement.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.iteration.class2.scope
rename to data/fixtures/scopes/c/statement/statement.iteration.class2.scope
diff --git a/data/fixtures/scopes/c/statement.iteration.document.scope b/data/fixtures/scopes/c/statement/statement.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.iteration.document.scope
rename to data/fixtures/scopes/c/statement/statement.iteration.document.scope
diff --git a/data/fixtures/scopes/c/statement.scope b/data/fixtures/scopes/c/statement/statement.scope
similarity index 100%
rename from data/fixtures/scopes/c/statement.scope
rename to data/fixtures/scopes/c/statement/statement.scope
diff --git a/data/fixtures/scopes/c/type.argument.formal.iteration.scope b/data/fixtures/scopes/c/type/type.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.argument.formal.iteration.scope
rename to data/fixtures/scopes/c/type/type.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/c/type.argument.formal.scope b/data/fixtures/scopes/c/type/type.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.argument.formal.scope
rename to data/fixtures/scopes/c/type/type.argument.formal.scope
diff --git a/data/fixtures/scopes/c/type.cast.scope b/data/fixtures/scopes/c/type/type.cast.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.cast.scope
rename to data/fixtures/scopes/c/type/type.cast.scope
diff --git a/data/fixtures/scopes/c/type.class.scope b/data/fixtures/scopes/c/type/type.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.class.scope
rename to data/fixtures/scopes/c/type/type.class.scope
diff --git a/data/fixtures/scopes/c/type.enum.scope b/data/fixtures/scopes/c/type/type.enum.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.enum.scope
rename to data/fixtures/scopes/c/type/type.enum.scope
diff --git a/data/fixtures/scopes/c/type.field.class.scope b/data/fixtures/scopes/c/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.field.class.scope
rename to data/fixtures/scopes/c/type/type.field.class.scope
diff --git a/data/fixtures/scopes/c/type.field.class2.scope b/data/fixtures/scopes/c/type/type.field.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.field.class2.scope
rename to data/fixtures/scopes/c/type/type.field.class2.scope
diff --git a/data/fixtures/scopes/c/type.iteration.block2.scope b/data/fixtures/scopes/c/type/type.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.iteration.block2.scope
rename to data/fixtures/scopes/c/type/type.iteration.block2.scope
diff --git a/data/fixtures/scopes/c/type.iteration.block3.scope b/data/fixtures/scopes/c/type/type.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.iteration.block3.scope
rename to data/fixtures/scopes/c/type/type.iteration.block3.scope
diff --git a/data/fixtures/scopes/c/type.iteration.block4.scope b/data/fixtures/scopes/c/type/type.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.iteration.block4.scope
rename to data/fixtures/scopes/c/type/type.iteration.block4.scope
diff --git a/data/fixtures/scopes/c/type.iteration.class.scope b/data/fixtures/scopes/c/type/type.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.iteration.class.scope
rename to data/fixtures/scopes/c/type/type.iteration.class.scope
diff --git a/data/fixtures/scopes/c/type.iteration.class2.scope b/data/fixtures/scopes/c/type/type.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.iteration.class2.scope
rename to data/fixtures/scopes/c/type/type.iteration.class2.scope
diff --git a/data/fixtures/scopes/c/type.iteration.document.scope b/data/fixtures/scopes/c/type/type.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.iteration.document.scope
rename to data/fixtures/scopes/c/type/type.iteration.document.scope
diff --git a/data/fixtures/scopes/c/type.return.scope b/data/fixtures/scopes/c/type/type.return.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.return.scope
rename to data/fixtures/scopes/c/type/type.return.scope
diff --git a/data/fixtures/scopes/c/type.variable.scope b/data/fixtures/scopes/c/type/type.variable.scope
similarity index 100%
rename from data/fixtures/scopes/c/type.variable.scope
rename to data/fixtures/scopes/c/type/type.variable.scope
diff --git a/data/fixtures/scopes/c/value.assignment.scope b/data/fixtures/scopes/c/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.assignment.scope
rename to data/fixtures/scopes/c/value/value.assignment.scope
diff --git a/data/fixtures/scopes/c/value.assignment2.scope b/data/fixtures/scopes/c/value/value.assignment2.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.assignment2.scope
rename to data/fixtures/scopes/c/value/value.assignment2.scope
diff --git a/data/fixtures/scopes/c/value.iteration.block2.scope b/data/fixtures/scopes/c/value/value.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.iteration.block2.scope
rename to data/fixtures/scopes/c/value/value.iteration.block2.scope
diff --git a/data/fixtures/scopes/c/value.iteration.block3.scope b/data/fixtures/scopes/c/value/value.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.iteration.block3.scope
rename to data/fixtures/scopes/c/value/value.iteration.block3.scope
diff --git a/data/fixtures/scopes/c/value.iteration.block4.scope b/data/fixtures/scopes/c/value/value.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.iteration.block4.scope
rename to data/fixtures/scopes/c/value/value.iteration.block4.scope
diff --git a/data/fixtures/scopes/c/value.iteration.class.scope b/data/fixtures/scopes/c/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.iteration.class.scope
rename to data/fixtures/scopes/c/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/c/value.iteration.class2.scope b/data/fixtures/scopes/c/value/value.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.iteration.class2.scope
rename to data/fixtures/scopes/c/value/value.iteration.class2.scope
diff --git a/data/fixtures/scopes/c/value.iteration.document.scope b/data/fixtures/scopes/c/value/value.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.iteration.document.scope
rename to data/fixtures/scopes/c/value/value.iteration.document.scope
diff --git a/data/fixtures/scopes/c/value.return.scope b/data/fixtures/scopes/c/value/value.return.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.return.scope
rename to data/fixtures/scopes/c/value/value.return.scope
diff --git a/data/fixtures/scopes/c/value.variable.scope b/data/fixtures/scopes/c/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/c/value.variable.scope
rename to data/fixtures/scopes/c/value/value.variable.scope
diff --git a/data/fixtures/scopes/cpp/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.actual.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.actual.constructor.iteration.scope
rename to data/fixtures/scopes/cpp/argument/argument.actual.constructor.iteration.scope
diff --git a/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argument/argument.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/cpp/argument/argument.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argument/argument.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/cpp/argument/argument.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.formal.lambda.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.lambda.iteration.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.lambda.iteration.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/cpp/argument/argument.formal.lambda.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.lambda.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/cpp/argument/argument.formal.lambda.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.lambda.singleLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.lambda.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.method.iteration.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope b/data/fixtures/scopes/cpp/argument/argument.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argument.formal.method.singleLine.scope b/data/fixtures/scopes/cpp/argument/argument.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argument.formal.method.singleLine.scope
rename to data/fixtures/scopes/cpp/argument/argument.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.actual.constructor.empty.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.actual.constructor.empty.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.actual.constructor.empty.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.actual.constructor.empty.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.constructor.empty.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.empty.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.constructor.empty.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.empty.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.lambda.empty.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.lambda.empty.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.lambda.empty.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.lambda.empty.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.lambda.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.lambda.multiLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.lambda.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.lambda.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.lambda.singleLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.lambda.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.method.empty.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.empty.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.method.empty.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.empty.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.method.multiLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/cpp/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/argumentList.formal.method.singleLine.scope
rename to data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/cpp/interior.class.scope b/data/fixtures/scopes/cpp/interior/interior.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.class.scope
rename to data/fixtures/scopes/cpp/interior/interior.class.scope
diff --git a/data/fixtures/scopes/cpp/interior.constructor.scope b/data/fixtures/scopes/cpp/interior/interior.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.constructor.scope
rename to data/fixtures/scopes/cpp/interior/interior.constructor.scope
diff --git a/data/fixtures/scopes/cpp/interior.foreach.scope b/data/fixtures/scopes/cpp/interior/interior.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.foreach.scope
rename to data/fixtures/scopes/cpp/interior/interior.foreach.scope
diff --git a/data/fixtures/scopes/cpp/interior.lambda.block.scope b/data/fixtures/scopes/cpp/interior/interior.lambda.block.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.lambda.block.scope
rename to data/fixtures/scopes/cpp/interior/interior.lambda.block.scope
diff --git a/data/fixtures/scopes/cpp/interior.method.scope b/data/fixtures/scopes/cpp/interior/interior.method.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.method.scope
rename to data/fixtures/scopes/cpp/interior/interior.method.scope
diff --git a/data/fixtures/scopes/cpp/interior.namespace.scope b/data/fixtures/scopes/cpp/interior/interior.namespace.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.namespace.scope
rename to data/fixtures/scopes/cpp/interior/interior.namespace.scope
diff --git a/data/fixtures/scopes/cpp/interior.try.scope b/data/fixtures/scopes/cpp/interior/interior.try.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/interior.try.scope
rename to data/fixtures/scopes/cpp/interior/interior.try.scope
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/cpp/name/name.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.constructor.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.argument.formal.constructor.scope
rename to data/fixtures/scopes/cpp/name/name.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.argument.formal.iteration.scope
rename to data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/cpp/name/name.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.method.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.argument.formal.method.scope
rename to data/fixtures/scopes/cpp/name/name.argument.formal.method.scope
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.argument.formal.scope
rename to data/fixtures/scopes/cpp/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/cpp/name.class.scope b/data/fixtures/scopes/cpp/name/name.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.class.scope
rename to data/fixtures/scopes/cpp/name/name.class.scope
diff --git a/data/fixtures/scopes/cpp/name.class2.scope b/data/fixtures/scopes/cpp/name/name.class2.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.class2.scope
rename to data/fixtures/scopes/cpp/name/name.class2.scope
diff --git a/data/fixtures/scopes/cpp/name.constructor.scope b/data/fixtures/scopes/cpp/name/name.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.constructor.scope
rename to data/fixtures/scopes/cpp/name/name.constructor.scope
diff --git a/data/fixtures/scopes/cpp/name.constructor2.scope b/data/fixtures/scopes/cpp/name/name.constructor2.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.constructor2.scope
rename to data/fixtures/scopes/cpp/name/name.constructor2.scope
diff --git a/data/fixtures/scopes/cpp/name.field.class.scope b/data/fixtures/scopes/cpp/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.field.class.scope
rename to data/fixtures/scopes/cpp/name/name.field.class.scope
diff --git a/data/fixtures/scopes/cpp/name.foreach.scope b/data/fixtures/scopes/cpp/name/name.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.foreach.scope
rename to data/fixtures/scopes/cpp/name/name.foreach.scope
diff --git a/data/fixtures/scopes/cpp/name.iteration.class.scope b/data/fixtures/scopes/cpp/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.iteration.class.scope
rename to data/fixtures/scopes/cpp/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/cpp/name.method.scope b/data/fixtures/scopes/cpp/name/name.method.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.method.scope
rename to data/fixtures/scopes/cpp/name/name.method.scope
diff --git a/data/fixtures/scopes/cpp/name.namespace.scope b/data/fixtures/scopes/cpp/name/name.namespace.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/name.namespace.scope
rename to data/fixtures/scopes/cpp/name/name.namespace.scope
diff --git a/data/fixtures/scopes/cpp/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/cpp/type/type.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/cpp/type.argument.formal.constructor.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.argument.formal.constructor.scope
rename to data/fixtures/scopes/cpp/type/type.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/cpp/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/cpp/type/type.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/cpp/type.argument.formal.method.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.argument.formal.method.scope
rename to data/fixtures/scopes/cpp/type/type.argument.formal.method.scope
diff --git a/data/fixtures/scopes/cpp/type.class.scope b/data/fixtures/scopes/cpp/type/type.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.class.scope
rename to data/fixtures/scopes/cpp/type/type.class.scope
diff --git a/data/fixtures/scopes/cpp/type.field.class.scope b/data/fixtures/scopes/cpp/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.field.class.scope
rename to data/fixtures/scopes/cpp/type/type.field.class.scope
diff --git a/data/fixtures/scopes/cpp/type.foreach.scope b/data/fixtures/scopes/cpp/type/type.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.foreach.scope
rename to data/fixtures/scopes/cpp/type/type.foreach.scope
diff --git a/data/fixtures/scopes/cpp/type.iteration.class.scope b/data/fixtures/scopes/cpp/type/type.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.iteration.class.scope
rename to data/fixtures/scopes/cpp/type/type.iteration.class.scope
diff --git a/data/fixtures/scopes/cpp/type.typeArgument.iteration.scope b/data/fixtures/scopes/cpp/type/type.typeArgument.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.typeArgument.iteration.scope
rename to data/fixtures/scopes/cpp/type/type.typeArgument.iteration.scope
diff --git a/data/fixtures/scopes/cpp/type.typeArgument.scope b/data/fixtures/scopes/cpp/type/type.typeArgument.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/type.typeArgument.scope
rename to data/fixtures/scopes/cpp/type/type.typeArgument.scope
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/cpp/value/value.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.constructor.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.argument.formal.constructor.scope
rename to data/fixtures/scopes/cpp/value/value.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.iteration.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.argument.formal.iteration.scope
rename to data/fixtures/scopes/cpp/value/value.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/cpp/value/value.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.method.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.argument.formal.method.scope
rename to data/fixtures/scopes/cpp/value/value.argument.formal.method.scope
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.argument.formal.scope
rename to data/fixtures/scopes/cpp/value/value.argument.formal.scope
diff --git a/data/fixtures/scopes/cpp/value.field.class.scope b/data/fixtures/scopes/cpp/value/value.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.field.class.scope
rename to data/fixtures/scopes/cpp/value/value.field.class.scope
diff --git a/data/fixtures/scopes/cpp/value.foreach.scope b/data/fixtures/scopes/cpp/value/value.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.foreach.scope
rename to data/fixtures/scopes/cpp/value/value.foreach.scope
diff --git a/data/fixtures/scopes/cpp/value.iteration.class.scope b/data/fixtures/scopes/cpp/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/cpp/value.iteration.class.scope
rename to data/fixtures/scopes/cpp/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.constructor.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.method.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.method.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.method.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.method.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.method.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.method.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.actual.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.actual.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.catch.scope b/data/fixtures/scopes/csharp/argument/argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.catch.scope
rename to data/fixtures/scopes/csharp/argument/argument.catch.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.lambda.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.lambda.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.lambda.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.lambda.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.method.iteration.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.method.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.method.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.method.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.method.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.multiLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/csharp/argument.formal.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/argument.formal.singleLine.scope
rename to data/fixtures/scopes/csharp/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/csharp/branch.if.elif.else.scope b/data/fixtures/scopes/csharp/branch/branch.if.elif.else.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.if.elif.else.scope
rename to data/fixtures/scopes/csharp/branch/branch.if.elif.else.scope
diff --git a/data/fixtures/scopes/csharp/branch.if.else.scope b/data/fixtures/scopes/csharp/branch/branch.if.else.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.if.else.scope
rename to data/fixtures/scopes/csharp/branch/branch.if.else.scope
diff --git a/data/fixtures/scopes/csharp/branch.if.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.if.iteration.scope
rename to data/fixtures/scopes/csharp/branch/branch.if.iteration.scope
diff --git a/data/fixtures/scopes/csharp/branch.if.scope b/data/fixtures/scopes/csharp/branch/branch.if.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.if.scope
rename to data/fixtures/scopes/csharp/branch/branch.if.scope
diff --git a/data/fixtures/scopes/csharp/branch.switchCase.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.switchCase.iteration.scope
rename to data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/csharp/branch.switchCase.scope b/data/fixtures/scopes/csharp/branch/branch.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.switchCase.scope
rename to data/fixtures/scopes/csharp/branch/branch.switchCase.scope
diff --git a/data/fixtures/scopes/csharp/branch.ternary.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.ternary.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.ternary.iteration.scope
rename to data/fixtures/scopes/csharp/branch/branch.ternary.iteration.scope
diff --git a/data/fixtures/scopes/csharp/branch.ternary.scope b/data/fixtures/scopes/csharp/branch/branch.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.ternary.scope
rename to data/fixtures/scopes/csharp/branch/branch.ternary.scope
diff --git a/data/fixtures/scopes/csharp/branch.try.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.try.iteration.scope
rename to data/fixtures/scopes/csharp/branch/branch.try.iteration.scope
diff --git a/data/fixtures/scopes/csharp/branch.try.scope b/data/fixtures/scopes/csharp/branch/branch.try.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/branch.try.scope
rename to data/fixtures/scopes/csharp/branch/branch.try.scope
diff --git a/data/fixtures/scopes/csharp/condition.doWhile.scope b/data/fixtures/scopes/csharp/condition/condition.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.doWhile.scope
rename to data/fixtures/scopes/csharp/condition/condition.doWhile.scope
diff --git a/data/fixtures/scopes/csharp/condition.for.scope b/data/fixtures/scopes/csharp/condition/condition.for.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.for.scope
rename to data/fixtures/scopes/csharp/condition/condition.for.scope
diff --git a/data/fixtures/scopes/csharp/condition.if.scope b/data/fixtures/scopes/csharp/condition/condition.if.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.if.scope
rename to data/fixtures/scopes/csharp/condition/condition.if.scope
diff --git a/data/fixtures/scopes/csharp/condition.switchCase.iteration.scope b/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.switchCase.iteration.scope
rename to data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/csharp/condition.switchCase.scope b/data/fixtures/scopes/csharp/condition/condition.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.switchCase.scope
rename to data/fixtures/scopes/csharp/condition/condition.switchCase.scope
diff --git a/data/fixtures/scopes/csharp/condition.ternary.scope b/data/fixtures/scopes/csharp/condition/condition.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.ternary.scope
rename to data/fixtures/scopes/csharp/condition/condition.ternary.scope
diff --git a/data/fixtures/scopes/csharp/condition.while.scope b/data/fixtures/scopes/csharp/condition/condition.while.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/condition.while.scope
rename to data/fixtures/scopes/csharp/condition/condition.while.scope
diff --git a/data/fixtures/scopes/csharp/functionCallee.constructor.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionCallee.constructor.scope
rename to data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor.scope
diff --git a/data/fixtures/scopes/csharp/functionCallee.constructor2.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionCallee.constructor2.scope
rename to data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor2.scope
diff --git a/data/fixtures/scopes/csharp/functionCallee.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionCallee.scope
rename to data/fixtures/scopes/csharp/functionCallee/functionCallee.scope
diff --git a/data/fixtures/scopes/csharp/functionCallee2.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionCallee2.scope
rename to data/fixtures/scopes/csharp/functionCallee/functionCallee2.scope
diff --git a/data/fixtures/scopes/csharp/functionCallee3.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee3.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionCallee3.scope
rename to data/fixtures/scopes/csharp/functionCallee/functionCallee3.scope
diff --git a/data/fixtures/scopes/csharp/functionCallee4.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee4.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionCallee4.scope
rename to data/fixtures/scopes/csharp/functionCallee/functionCallee4.scope
diff --git a/data/fixtures/scopes/csharp/functionName.constructor.scope b/data/fixtures/scopes/csharp/functionName/functionName.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionName.constructor.scope
rename to data/fixtures/scopes/csharp/functionName/functionName.constructor.scope
diff --git a/data/fixtures/scopes/csharp/functionName.iteration.document.scope b/data/fixtures/scopes/csharp/functionName/functionName.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionName.iteration.document.scope
rename to data/fixtures/scopes/csharp/functionName/functionName.iteration.document.scope
diff --git a/data/fixtures/scopes/csharp/functionName.method.iteration.class.scope b/data/fixtures/scopes/csharp/functionName/functionName.method.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionName.method.iteration.class.scope
rename to data/fixtures/scopes/csharp/functionName/functionName.method.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/functionName.method.scope b/data/fixtures/scopes/csharp/functionName/functionName.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionName.method.scope
rename to data/fixtures/scopes/csharp/functionName/functionName.method.scope
diff --git a/data/fixtures/scopes/csharp/functionName.scope b/data/fixtures/scopes/csharp/functionName/functionName.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/functionName.scope
rename to data/fixtures/scopes/csharp/functionName/functionName.scope
diff --git a/data/fixtures/scopes/csharp/interior.class.scope b/data/fixtures/scopes/csharp/interior/interior.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.class.scope
rename to data/fixtures/scopes/csharp/interior/interior.class.scope
diff --git a/data/fixtures/scopes/csharp/interior.constructor.scope b/data/fixtures/scopes/csharp/interior/interior.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.constructor.scope
rename to data/fixtures/scopes/csharp/interior/interior.constructor.scope
diff --git a/data/fixtures/scopes/csharp/interior.doWhile.scope b/data/fixtures/scopes/csharp/interior/interior.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.doWhile.scope
rename to data/fixtures/scopes/csharp/interior/interior.doWhile.scope
diff --git a/data/fixtures/scopes/csharp/interior.for.scope b/data/fixtures/scopes/csharp/interior/interior.for.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.for.scope
rename to data/fixtures/scopes/csharp/interior/interior.for.scope
diff --git a/data/fixtures/scopes/csharp/interior.foreach.scope b/data/fixtures/scopes/csharp/interior/interior.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.foreach.scope
rename to data/fixtures/scopes/csharp/interior/interior.foreach.scope
diff --git a/data/fixtures/scopes/csharp/interior.function.scope b/data/fixtures/scopes/csharp/interior/interior.function.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.function.scope
rename to data/fixtures/scopes/csharp/interior/interior.function.scope
diff --git a/data/fixtures/scopes/csharp/interior.if.scope b/data/fixtures/scopes/csharp/interior/interior.if.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.if.scope
rename to data/fixtures/scopes/csharp/interior/interior.if.scope
diff --git a/data/fixtures/scopes/csharp/interior.interface.scope b/data/fixtures/scopes/csharp/interior/interior.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.interface.scope
rename to data/fixtures/scopes/csharp/interior/interior.interface.scope
diff --git a/data/fixtures/scopes/csharp/interior.lambda.block.scope b/data/fixtures/scopes/csharp/interior/interior.lambda.block.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.lambda.block.scope
rename to data/fixtures/scopes/csharp/interior/interior.lambda.block.scope
diff --git a/data/fixtures/scopes/csharp/interior.lambda.expression.scope b/data/fixtures/scopes/csharp/interior/interior.lambda.expression.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.lambda.expression.scope
rename to data/fixtures/scopes/csharp/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/csharp/interior.method.scope b/data/fixtures/scopes/csharp/interior/interior.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.method.scope
rename to data/fixtures/scopes/csharp/interior/interior.method.scope
diff --git a/data/fixtures/scopes/csharp/interior.switch.scope b/data/fixtures/scopes/csharp/interior/interior.switch.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.switch.scope
rename to data/fixtures/scopes/csharp/interior/interior.switch.scope
diff --git a/data/fixtures/scopes/csharp/interior.switchCase.scope b/data/fixtures/scopes/csharp/interior/interior.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.switchCase.scope
rename to data/fixtures/scopes/csharp/interior/interior.switchCase.scope
diff --git a/data/fixtures/scopes/csharp/interior.ternary.scope b/data/fixtures/scopes/csharp/interior/interior.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.ternary.scope
rename to data/fixtures/scopes/csharp/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/csharp/interior.try.scope b/data/fixtures/scopes/csharp/interior/interior.try.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.try.scope
rename to data/fixtures/scopes/csharp/interior/interior.try.scope
diff --git a/data/fixtures/scopes/csharp/interior.while.scope b/data/fixtures/scopes/csharp/interior/interior.while.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/interior.while.scope
rename to data/fixtures/scopes/csharp/interior/interior.while.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.catch.scope b/data/fixtures/scopes/csharp/name/name.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.catch.scope
rename to data/fixtures/scopes/csharp/name/name.argument.catch.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/csharp/name/name.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.constructor.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.formal.constructor.scope
rename to data/fixtures/scopes/csharp/name/name.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.formal.iteration.scope
rename to data/fixtures/scopes/csharp/name/name.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/csharp/name/name.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.method.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.formal.method.scope
rename to data/fixtures/scopes/csharp/name/name.argument.formal.method.scope
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.argument.formal.scope
rename to data/fixtures/scopes/csharp/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/csharp/name.assignment.scope b/data/fixtures/scopes/csharp/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.assignment.scope
rename to data/fixtures/scopes/csharp/name/name.assignment.scope
diff --git a/data/fixtures/scopes/csharp/name.assignment2.scope b/data/fixtures/scopes/csharp/name/name.assignment2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.assignment2.scope
rename to data/fixtures/scopes/csharp/name/name.assignment2.scope
diff --git a/data/fixtures/scopes/csharp/name.class.scope b/data/fixtures/scopes/csharp/name/name.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.class.scope
rename to data/fixtures/scopes/csharp/name/name.class.scope
diff --git a/data/fixtures/scopes/csharp/name.constructor.scope b/data/fixtures/scopes/csharp/name/name.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.constructor.scope
rename to data/fixtures/scopes/csharp/name/name.constructor.scope
diff --git a/data/fixtures/scopes/csharp/name.field.class.scope b/data/fixtures/scopes/csharp/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.field.class.scope
rename to data/fixtures/scopes/csharp/name/name.field.class.scope
diff --git a/data/fixtures/scopes/csharp/name.field.interface.scope b/data/fixtures/scopes/csharp/name/name.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.field.interface.scope
rename to data/fixtures/scopes/csharp/name/name.field.interface.scope
diff --git a/data/fixtures/scopes/csharp/name.foreach.scope b/data/fixtures/scopes/csharp/name/name.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.foreach.scope
rename to data/fixtures/scopes/csharp/name/name.foreach.scope
diff --git a/data/fixtures/scopes/csharp/name.function.scope b/data/fixtures/scopes/csharp/name/name.function.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.function.scope
rename to data/fixtures/scopes/csharp/name/name.function.scope
diff --git a/data/fixtures/scopes/csharp/name.interface.scope b/data/fixtures/scopes/csharp/name/name.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.interface.scope
rename to data/fixtures/scopes/csharp/name/name.interface.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.block.scope b/data/fixtures/scopes/csharp/name/name.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.block.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.block.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.block2.scope b/data/fixtures/scopes/csharp/name/name.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.block2.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.block2.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.block3.scope b/data/fixtures/scopes/csharp/name/name.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.block3.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.block3.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.block4.scope b/data/fixtures/scopes/csharp/name/name.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.block4.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.block4.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.class.scope b/data/fixtures/scopes/csharp/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.class.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.document.scope b/data/fixtures/scopes/csharp/name/name.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.document.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.document.scope
diff --git a/data/fixtures/scopes/csharp/name.iteration.interface.scope b/data/fixtures/scopes/csharp/name/name.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.iteration.interface.scope
rename to data/fixtures/scopes/csharp/name/name.iteration.interface.scope
diff --git a/data/fixtures/scopes/csharp/name.method.scope b/data/fixtures/scopes/csharp/name/name.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.method.scope
rename to data/fixtures/scopes/csharp/name/name.method.scope
diff --git a/data/fixtures/scopes/csharp/name.variable.scope b/data/fixtures/scopes/csharp/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/name.variable.scope
rename to data/fixtures/scopes/csharp/name/name.variable.scope
diff --git a/data/fixtures/scopes/csharp/namedFunction.constructor.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/namedFunction.constructor.scope
rename to data/fixtures/scopes/csharp/namedFunction/namedFunction.constructor.scope
diff --git a/data/fixtures/scopes/csharp/namedFunction.iteration.document.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/namedFunction.iteration.document.scope
rename to data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope
diff --git a/data/fixtures/scopes/csharp/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/namedFunction.method.iteration.class.scope
rename to data/fixtures/scopes/csharp/namedFunction/namedFunction.method.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/namedFunction.method.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/namedFunction.method.scope
rename to data/fixtures/scopes/csharp/namedFunction/namedFunction.method.scope
diff --git a/data/fixtures/scopes/csharp/namedFunction.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/namedFunction.scope
rename to data/fixtures/scopes/csharp/namedFunction/namedFunction.scope
diff --git a/data/fixtures/scopes/csharp/statement.class.scope b/data/fixtures/scopes/csharp/statement/statement.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.class.scope
rename to data/fixtures/scopes/csharp/statement/statement.class.scope
diff --git a/data/fixtures/scopes/csharp/statement.field.class.scope b/data/fixtures/scopes/csharp/statement/statement.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.field.class.scope
rename to data/fixtures/scopes/csharp/statement/statement.field.class.scope
diff --git a/data/fixtures/scopes/csharp/statement.field.interface.scope b/data/fixtures/scopes/csharp/statement/statement.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.field.interface.scope
rename to data/fixtures/scopes/csharp/statement/statement.field.interface.scope
diff --git a/data/fixtures/scopes/csharp/statement.interface.scope b/data/fixtures/scopes/csharp/statement/statement.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.interface.scope
rename to data/fixtures/scopes/csharp/statement/statement.interface.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.block.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.block.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.block.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.block2.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.block2.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.block2.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.block3.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.block3.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.block3.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.block4.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.block4.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.block4.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.class.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.class.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.document.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.document.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.document.scope
diff --git a/data/fixtures/scopes/csharp/statement.iteration.interface.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.iteration.interface.scope
rename to data/fixtures/scopes/csharp/statement/statement.iteration.interface.scope
diff --git a/data/fixtures/scopes/csharp/statement.scope b/data/fixtures/scopes/csharp/statement/statement.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/statement.scope
rename to data/fixtures/scopes/csharp/statement/statement.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.catch.scope b/data/fixtures/scopes/csharp/type/type.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.catch.scope
rename to data/fixtures/scopes/csharp/type/type.argument.catch.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/csharp/type/type.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.constructor.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.formal.constructor.scope
rename to data/fixtures/scopes/csharp/type/type.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.formal.iteration.scope
rename to data/fixtures/scopes/csharp/type/type.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/csharp/type/type.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.method.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.formal.method.scope
rename to data/fixtures/scopes/csharp/type/type.argument.formal.method.scope
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.argument.formal.scope
rename to data/fixtures/scopes/csharp/type/type.argument.formal.scope
diff --git a/data/fixtures/scopes/csharp/type.cast.scope b/data/fixtures/scopes/csharp/type/type.cast.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.cast.scope
rename to data/fixtures/scopes/csharp/type/type.cast.scope
diff --git a/data/fixtures/scopes/csharp/type.class.scope b/data/fixtures/scopes/csharp/type/type.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.class.scope
rename to data/fixtures/scopes/csharp/type/type.class.scope
diff --git a/data/fixtures/scopes/csharp/type.enum.scope b/data/fixtures/scopes/csharp/type/type.enum.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.enum.scope
rename to data/fixtures/scopes/csharp/type/type.enum.scope
diff --git a/data/fixtures/scopes/csharp/type.field.class.scope b/data/fixtures/scopes/csharp/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.field.class.scope
rename to data/fixtures/scopes/csharp/type/type.field.class.scope
diff --git a/data/fixtures/scopes/csharp/type.field.interface.scope b/data/fixtures/scopes/csharp/type/type.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.field.interface.scope
rename to data/fixtures/scopes/csharp/type/type.field.interface.scope
diff --git a/data/fixtures/scopes/csharp/type.foreach.scope b/data/fixtures/scopes/csharp/type/type.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.foreach.scope
rename to data/fixtures/scopes/csharp/type/type.foreach.scope
diff --git a/data/fixtures/scopes/csharp/type.interface.scope b/data/fixtures/scopes/csharp/type/type.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.interface.scope
rename to data/fixtures/scopes/csharp/type/type.interface.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.block.scope b/data/fixtures/scopes/csharp/type/type.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.block.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.block.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.block2.scope b/data/fixtures/scopes/csharp/type/type.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.block2.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.block2.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.block3.scope b/data/fixtures/scopes/csharp/type/type.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.block3.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.block3.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.block4.scope b/data/fixtures/scopes/csharp/type/type.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.block4.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.block4.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.class.scope b/data/fixtures/scopes/csharp/type/type.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.class.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.document.scope b/data/fixtures/scopes/csharp/type/type.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.document.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.document.scope
diff --git a/data/fixtures/scopes/csharp/type.iteration.interface.scope b/data/fixtures/scopes/csharp/type/type.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.iteration.interface.scope
rename to data/fixtures/scopes/csharp/type/type.iteration.interface.scope
diff --git a/data/fixtures/scopes/csharp/type.return.scope b/data/fixtures/scopes/csharp/type/type.return.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.return.scope
rename to data/fixtures/scopes/csharp/type/type.return.scope
diff --git a/data/fixtures/scopes/csharp/type.typeArgument.iteration.scope b/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.typeArgument.iteration.scope
rename to data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope
diff --git a/data/fixtures/scopes/csharp/type.typeArgument.scope b/data/fixtures/scopes/csharp/type/type.typeArgument.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.typeArgument.scope
rename to data/fixtures/scopes/csharp/type/type.typeArgument.scope
diff --git a/data/fixtures/scopes/csharp/type.variable.scope b/data/fixtures/scopes/csharp/type/type.variable.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/type.variable.scope
rename to data/fixtures/scopes/csharp/type/type.variable.scope
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/csharp/value/value.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.constructor.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.argument.formal.constructor.scope
rename to data/fixtures/scopes/csharp/value/value.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.argument.formal.iteration.scope
rename to data/fixtures/scopes/csharp/value/value.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/csharp/value/value.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.method.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.argument.formal.method.scope
rename to data/fixtures/scopes/csharp/value/value.argument.formal.method.scope
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.argument.formal.scope
rename to data/fixtures/scopes/csharp/value/value.argument.formal.scope
diff --git a/data/fixtures/scopes/csharp/value.assignment.scope b/data/fixtures/scopes/csharp/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.assignment.scope
rename to data/fixtures/scopes/csharp/value/value.assignment.scope
diff --git a/data/fixtures/scopes/csharp/value.field.class.scope b/data/fixtures/scopes/csharp/value/value.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.field.class.scope
rename to data/fixtures/scopes/csharp/value/value.field.class.scope
diff --git a/data/fixtures/scopes/csharp/value.foreach.scope b/data/fixtures/scopes/csharp/value/value.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.foreach.scope
rename to data/fixtures/scopes/csharp/value/value.foreach.scope
diff --git a/data/fixtures/scopes/csharp/value.iteration.block.scope b/data/fixtures/scopes/csharp/value/value.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.iteration.block.scope
rename to data/fixtures/scopes/csharp/value/value.iteration.block.scope
diff --git a/data/fixtures/scopes/csharp/value.iteration.block2.scope b/data/fixtures/scopes/csharp/value/value.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.iteration.block2.scope
rename to data/fixtures/scopes/csharp/value/value.iteration.block2.scope
diff --git a/data/fixtures/scopes/csharp/value.iteration.block3.scope b/data/fixtures/scopes/csharp/value/value.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.iteration.block3.scope
rename to data/fixtures/scopes/csharp/value/value.iteration.block3.scope
diff --git a/data/fixtures/scopes/csharp/value.iteration.block4.scope b/data/fixtures/scopes/csharp/value/value.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.iteration.block4.scope
rename to data/fixtures/scopes/csharp/value/value.iteration.block4.scope
diff --git a/data/fixtures/scopes/csharp/value.iteration.class.scope b/data/fixtures/scopes/csharp/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.iteration.class.scope
rename to data/fixtures/scopes/csharp/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/csharp/value.iteration.document.scope b/data/fixtures/scopes/csharp/value/value.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.iteration.document.scope
rename to data/fixtures/scopes/csharp/value/value.iteration.document.scope
diff --git a/data/fixtures/scopes/csharp/value.mapPair.iteration.scope b/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.mapPair.iteration.scope
rename to data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope
diff --git a/data/fixtures/scopes/csharp/value.mapPair.scope b/data/fixtures/scopes/csharp/value/value.mapPair.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.mapPair.scope
rename to data/fixtures/scopes/csharp/value/value.mapPair.scope
diff --git a/data/fixtures/scopes/csharp/value.return.lambda.scope b/data/fixtures/scopes/csharp/value/value.return.lambda.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.return.lambda.scope
rename to data/fixtures/scopes/csharp/value/value.return.lambda.scope
diff --git a/data/fixtures/scopes/csharp/value.return.scope b/data/fixtures/scopes/csharp/value/value.return.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.return.scope
rename to data/fixtures/scopes/csharp/value/value.return.scope
diff --git a/data/fixtures/scopes/csharp/value.variable.scope b/data/fixtures/scopes/csharp/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.variable.scope
rename to data/fixtures/scopes/csharp/value/value.variable.scope
diff --git a/data/fixtures/scopes/csharp/value.yield.scope b/data/fixtures/scopes/csharp/value/value.yield.scope
similarity index 100%
rename from data/fixtures/scopes/csharp/value.yield.scope
rename to data/fixtures/scopes/csharp/value/value.yield.scope
diff --git a/data/fixtures/scopes/css/argument.actual.iteration.scope b/data/fixtures/scopes/css/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/css/argument.actual.iteration.scope
rename to data/fixtures/scopes/css/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/css/argument.actual.iteration2.scope b/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/css/argument.actual.iteration2.scope
rename to data/fixtures/scopes/css/argument/argument.actual.iteration2.scope
diff --git a/data/fixtures/scopes/css/argument.actual.singleLine.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/css/argument.actual.singleLine.scope
rename to data/fixtures/scopes/css/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/css/argument.actual.singleLine2.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/css/argument.actual.singleLine2.scope
rename to data/fixtures/scopes/css/argument/argument.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/css/argument.actual.singleLine3.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine3.scope
similarity index 100%
rename from data/fixtures/scopes/css/argument.actual.singleLine3.scope
rename to data/fixtures/scopes/css/argument/argument.actual.singleLine3.scope
diff --git a/data/fixtures/scopes/css/argument.actual.singleLine4.scope b/data/fixtures/scopes/css/argument/argument.actual.singleLine4.scope
similarity index 100%
rename from data/fixtures/scopes/css/argument.actual.singleLine4.scope
rename to data/fixtures/scopes/css/argument/argument.actual.singleLine4.scope
diff --git a/data/fixtures/scopes/css/selector.scope b/data/fixtures/scopes/css/selector/selector.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector.scope
rename to data/fixtures/scopes/css/selector/selector.scope
diff --git a/data/fixtures/scopes/css/selector2.scope b/data/fixtures/scopes/css/selector/selector2.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector2.scope
rename to data/fixtures/scopes/css/selector/selector2.scope
diff --git a/data/fixtures/scopes/css/selector3.scope b/data/fixtures/scopes/css/selector/selector3.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector3.scope
rename to data/fixtures/scopes/css/selector/selector3.scope
diff --git a/data/fixtures/scopes/css/selector4.scope b/data/fixtures/scopes/css/selector/selector4.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector4.scope
rename to data/fixtures/scopes/css/selector/selector4.scope
diff --git a/data/fixtures/scopes/css/selector5.scope b/data/fixtures/scopes/css/selector/selector5.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector5.scope
rename to data/fixtures/scopes/css/selector/selector5.scope
diff --git a/data/fixtures/scopes/css/selector6.scope b/data/fixtures/scopes/css/selector/selector6.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector6.scope
rename to data/fixtures/scopes/css/selector/selector6.scope
diff --git a/data/fixtures/scopes/css/selector7.scope b/data/fixtures/scopes/css/selector/selector7.scope
similarity index 100%
rename from data/fixtures/scopes/css/selector7.scope
rename to data/fixtures/scopes/css/selector/selector7.scope
diff --git a/data/fixtures/scopes/css/unit.scope b/data/fixtures/scopes/css/unit/unit.scope
similarity index 100%
rename from data/fixtures/scopes/css/unit.scope
rename to data/fixtures/scopes/css/unit/unit.scope
diff --git a/data/fixtures/scopes/css/unit2.scope b/data/fixtures/scopes/css/unit/unit2.scope
similarity index 100%
rename from data/fixtures/scopes/css/unit2.scope
rename to data/fixtures/scopes/css/unit/unit2.scope
diff --git a/data/fixtures/scopes/css/unit3.scope b/data/fixtures/scopes/css/unit/unit3.scope
similarity index 100%
rename from data/fixtures/scopes/css/unit3.scope
rename to data/fixtures/scopes/css/unit/unit3.scope
diff --git a/data/fixtures/scopes/css/unit4.scope b/data/fixtures/scopes/css/unit/unit4.scope
similarity index 100%
rename from data/fixtures/scopes/css/unit4.scope
rename to data/fixtures/scopes/css/unit/unit4.scope
diff --git a/data/fixtures/scopes/css/unit5.scope b/data/fixtures/scopes/css/unit/unit5.scope
similarity index 100%
rename from data/fixtures/scopes/css/unit5.scope
rename to data/fixtures/scopes/css/unit/unit5.scope
diff --git a/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/java/argument/argument.actual.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.constructor.iteration.scope
rename to data/fixtures/scopes/java/argument/argument.actual.constructor.iteration.scope
diff --git a/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/java/argument/argument.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/java/argument/argument.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/java/argument/argument.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/java/argument/argument.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/java/argument.actual.iteration.scope b/data/fixtures/scopes/java/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.iteration.scope
rename to data/fixtures/scopes/java/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/java/argument.actual.method.iteration.scope b/data/fixtures/scopes/java/argument/argument.actual.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.method.iteration.scope
rename to data/fixtures/scopes/java/argument/argument.actual.method.iteration.scope
diff --git a/data/fixtures/scopes/java/argument.actual.method.multiLine.scope b/data/fixtures/scopes/java/argument/argument.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.method.multiLine.scope
rename to data/fixtures/scopes/java/argument/argument.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/java/argument.actual.method.singleLine.scope b/data/fixtures/scopes/java/argument/argument.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.method.singleLine.scope
rename to data/fixtures/scopes/java/argument/argument.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/java/argument.actual.multiLine.scope b/data/fixtures/scopes/java/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.multiLine.scope
rename to data/fixtures/scopes/java/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/java/argument.actual.singleLine.scope b/data/fixtures/scopes/java/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.actual.singleLine.scope
rename to data/fixtures/scopes/java/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/java/argument.catch.scope b/data/fixtures/scopes/java/argument/argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.catch.scope
rename to data/fixtures/scopes/java/argument/argument.catch.scope
diff --git a/data/fixtures/scopes/java/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/argument/argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/java/argument/argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/java/argument/argument.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/java/argument/argument.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/java/argument/argument.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/java/argument/argument.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/java/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/java/argument/argument.formal.lambda.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.lambda.iteration.scope
rename to data/fixtures/scopes/java/argument/argument.formal.lambda.iteration.scope
diff --git a/data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/java/argument/argument.formal.lambda.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope
rename to data/fixtures/scopes/java/argument/argument.formal.lambda.multiLine.scope
diff --git a/data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/java/argument/argument.formal.lambda.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope
rename to data/fixtures/scopes/java/argument/argument.formal.lambda.singleLine.scope
diff --git a/data/fixtures/scopes/java/argument.formal.method.iteration.scope b/data/fixtures/scopes/java/argument/argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.method.iteration.scope
rename to data/fixtures/scopes/java/argument/argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/java/argument.formal.method.multiLine.scope b/data/fixtures/scopes/java/argument/argument.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.method.multiLine.scope
rename to data/fixtures/scopes/java/argument/argument.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/java/argument.formal.method.singleLine.scope b/data/fixtures/scopes/java/argument/argument.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/java/argument.formal.method.singleLine.scope
rename to data/fixtures/scopes/java/argument/argument.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/java/branch.if.elif.else.scope b/data/fixtures/scopes/java/branch/branch.if.elif.else.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.if.elif.else.scope
rename to data/fixtures/scopes/java/branch/branch.if.elif.else.scope
diff --git a/data/fixtures/scopes/java/branch.if.else.scope b/data/fixtures/scopes/java/branch/branch.if.else.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.if.else.scope
rename to data/fixtures/scopes/java/branch/branch.if.else.scope
diff --git a/data/fixtures/scopes/java/branch.if.iteration.scope b/data/fixtures/scopes/java/branch/branch.if.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.if.iteration.scope
rename to data/fixtures/scopes/java/branch/branch.if.iteration.scope
diff --git a/data/fixtures/scopes/java/branch.if.scope b/data/fixtures/scopes/java/branch/branch.if.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.if.scope
rename to data/fixtures/scopes/java/branch/branch.if.scope
diff --git a/data/fixtures/scopes/java/branch.switchCase.iteration.scope b/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.switchCase.iteration.scope
rename to data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/java/branch.switchCase.scope b/data/fixtures/scopes/java/branch/branch.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.switchCase.scope
rename to data/fixtures/scopes/java/branch/branch.switchCase.scope
diff --git a/data/fixtures/scopes/java/branch.ternary.iteration.scope b/data/fixtures/scopes/java/branch/branch.ternary.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.ternary.iteration.scope
rename to data/fixtures/scopes/java/branch/branch.ternary.iteration.scope
diff --git a/data/fixtures/scopes/java/branch.ternary.scope b/data/fixtures/scopes/java/branch/branch.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.ternary.scope
rename to data/fixtures/scopes/java/branch/branch.ternary.scope
diff --git a/data/fixtures/scopes/java/branch.try.iteration.scope b/data/fixtures/scopes/java/branch/branch.try.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.try.iteration.scope
rename to data/fixtures/scopes/java/branch/branch.try.iteration.scope
diff --git a/data/fixtures/scopes/java/branch.try.scope b/data/fixtures/scopes/java/branch/branch.try.scope
similarity index 100%
rename from data/fixtures/scopes/java/branch.try.scope
rename to data/fixtures/scopes/java/branch/branch.try.scope
diff --git a/data/fixtures/scopes/java/condition.doWhile.scope b/data/fixtures/scopes/java/condition/condition.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.doWhile.scope
rename to data/fixtures/scopes/java/condition/condition.doWhile.scope
diff --git a/data/fixtures/scopes/java/condition.for.scope b/data/fixtures/scopes/java/condition/condition.for.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.for.scope
rename to data/fixtures/scopes/java/condition/condition.for.scope
diff --git a/data/fixtures/scopes/java/condition.if.scope b/data/fixtures/scopes/java/condition/condition.if.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.if.scope
rename to data/fixtures/scopes/java/condition/condition.if.scope
diff --git a/data/fixtures/scopes/java/condition.switchCase.iteration.scope b/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.switchCase.iteration.scope
rename to data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/java/condition.switchCase.scope b/data/fixtures/scopes/java/condition/condition.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.switchCase.scope
rename to data/fixtures/scopes/java/condition/condition.switchCase.scope
diff --git a/data/fixtures/scopes/java/condition.ternary.scope b/data/fixtures/scopes/java/condition/condition.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.ternary.scope
rename to data/fixtures/scopes/java/condition/condition.ternary.scope
diff --git a/data/fixtures/scopes/java/condition.while.scope b/data/fixtures/scopes/java/condition/condition.while.scope
similarity index 100%
rename from data/fixtures/scopes/java/condition.while.scope
rename to data/fixtures/scopes/java/condition/condition.while.scope
diff --git a/data/fixtures/scopes/java/interior.class.scope b/data/fixtures/scopes/java/interior/interior.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.class.scope
rename to data/fixtures/scopes/java/interior/interior.class.scope
diff --git a/data/fixtures/scopes/java/interior.constructor.scope b/data/fixtures/scopes/java/interior/interior.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.constructor.scope
rename to data/fixtures/scopes/java/interior/interior.constructor.scope
diff --git a/data/fixtures/scopes/java/interior.doWhile.scope b/data/fixtures/scopes/java/interior/interior.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.doWhile.scope
rename to data/fixtures/scopes/java/interior/interior.doWhile.scope
diff --git a/data/fixtures/scopes/java/interior.for.scope b/data/fixtures/scopes/java/interior/interior.for.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.for.scope
rename to data/fixtures/scopes/java/interior/interior.for.scope
diff --git a/data/fixtures/scopes/java/interior.foreach.scope b/data/fixtures/scopes/java/interior/interior.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.foreach.scope
rename to data/fixtures/scopes/java/interior/interior.foreach.scope
diff --git a/data/fixtures/scopes/java/interior.if.scope b/data/fixtures/scopes/java/interior/interior.if.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.if.scope
rename to data/fixtures/scopes/java/interior/interior.if.scope
diff --git a/data/fixtures/scopes/java/interior.interface.scope b/data/fixtures/scopes/java/interior/interior.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.interface.scope
rename to data/fixtures/scopes/java/interior/interior.interface.scope
diff --git a/data/fixtures/scopes/java/interior.lambda.block.scope b/data/fixtures/scopes/java/interior/interior.lambda.block.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.lambda.block.scope
rename to data/fixtures/scopes/java/interior/interior.lambda.block.scope
diff --git a/data/fixtures/scopes/java/interior.lambda.expression.scope b/data/fixtures/scopes/java/interior/interior.lambda.expression.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.lambda.expression.scope
rename to data/fixtures/scopes/java/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/java/interior.method.scope b/data/fixtures/scopes/java/interior/interior.method.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.method.scope
rename to data/fixtures/scopes/java/interior/interior.method.scope
diff --git a/data/fixtures/scopes/java/interior.resource.scope b/data/fixtures/scopes/java/interior/interior.resource.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.resource.scope
rename to data/fixtures/scopes/java/interior/interior.resource.scope
diff --git a/data/fixtures/scopes/java/interior.static.scope b/data/fixtures/scopes/java/interior/interior.static.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.static.scope
rename to data/fixtures/scopes/java/interior/interior.static.scope
diff --git a/data/fixtures/scopes/java/interior.switch.scope b/data/fixtures/scopes/java/interior/interior.switch.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.switch.scope
rename to data/fixtures/scopes/java/interior/interior.switch.scope
diff --git a/data/fixtures/scopes/java/interior.switchCase.scope b/data/fixtures/scopes/java/interior/interior.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.switchCase.scope
rename to data/fixtures/scopes/java/interior/interior.switchCase.scope
diff --git a/data/fixtures/scopes/java/interior.ternary.scope b/data/fixtures/scopes/java/interior/interior.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.ternary.scope
rename to data/fixtures/scopes/java/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/java/interior.try.scope b/data/fixtures/scopes/java/interior/interior.try.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.try.scope
rename to data/fixtures/scopes/java/interior/interior.try.scope
diff --git a/data/fixtures/scopes/java/interior.while.scope b/data/fixtures/scopes/java/interior/interior.while.scope
similarity index 100%
rename from data/fixtures/scopes/java/interior.while.scope
rename to data/fixtures/scopes/java/interior/interior.while.scope
diff --git a/data/fixtures/scopes/java/name.argument.catch.scope b/data/fixtures/scopes/java/name/name.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.argument.catch.scope
rename to data/fixtures/scopes/java/name/name.argument.catch.scope
diff --git a/data/fixtures/scopes/java/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/name/name.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/java/name/name.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/java/name.argument.formal.constructor.scope b/data/fixtures/scopes/java/name/name.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.argument.formal.constructor.scope
rename to data/fixtures/scopes/java/name/name.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/java/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/java/name/name.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/java/name/name.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/java/name.argument.formal.method.scope b/data/fixtures/scopes/java/name/name.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.argument.formal.method.scope
rename to data/fixtures/scopes/java/name/name.argument.formal.method.scope
diff --git a/data/fixtures/scopes/java/name.assignment.scope b/data/fixtures/scopes/java/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.assignment.scope
rename to data/fixtures/scopes/java/name/name.assignment.scope
diff --git a/data/fixtures/scopes/java/name.class.scope b/data/fixtures/scopes/java/name/name.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.class.scope
rename to data/fixtures/scopes/java/name/name.class.scope
diff --git a/data/fixtures/scopes/java/name.constructor.scope b/data/fixtures/scopes/java/name/name.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.constructor.scope
rename to data/fixtures/scopes/java/name/name.constructor.scope
diff --git a/data/fixtures/scopes/java/name.field.class.scope b/data/fixtures/scopes/java/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.field.class.scope
rename to data/fixtures/scopes/java/name/name.field.class.scope
diff --git a/data/fixtures/scopes/java/name.field.interface.scope b/data/fixtures/scopes/java/name/name.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.field.interface.scope
rename to data/fixtures/scopes/java/name/name.field.interface.scope
diff --git a/data/fixtures/scopes/java/name.foreach.scope b/data/fixtures/scopes/java/name/name.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.foreach.scope
rename to data/fixtures/scopes/java/name/name.foreach.scope
diff --git a/data/fixtures/scopes/java/name.interface.scope b/data/fixtures/scopes/java/name/name.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.interface.scope
rename to data/fixtures/scopes/java/name/name.interface.scope
diff --git a/data/fixtures/scopes/java/name.iteration.block.scope b/data/fixtures/scopes/java/name/name.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.block.scope
rename to data/fixtures/scopes/java/name/name.iteration.block.scope
diff --git a/data/fixtures/scopes/java/name.iteration.block2.scope b/data/fixtures/scopes/java/name/name.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.block2.scope
rename to data/fixtures/scopes/java/name/name.iteration.block2.scope
diff --git a/data/fixtures/scopes/java/name.iteration.block3.scope b/data/fixtures/scopes/java/name/name.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.block3.scope
rename to data/fixtures/scopes/java/name/name.iteration.block3.scope
diff --git a/data/fixtures/scopes/java/name.iteration.block4.scope b/data/fixtures/scopes/java/name/name.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.block4.scope
rename to data/fixtures/scopes/java/name/name.iteration.block4.scope
diff --git a/data/fixtures/scopes/java/name.iteration.class.scope b/data/fixtures/scopes/java/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.class.scope
rename to data/fixtures/scopes/java/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/java/name.iteration.document.scope b/data/fixtures/scopes/java/name/name.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.document.scope
rename to data/fixtures/scopes/java/name/name.iteration.document.scope
diff --git a/data/fixtures/scopes/java/name.iteration.interface.scope b/data/fixtures/scopes/java/name/name.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.iteration.interface.scope
rename to data/fixtures/scopes/java/name/name.iteration.interface.scope
diff --git a/data/fixtures/scopes/java/name.method.scope b/data/fixtures/scopes/java/name/name.method.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.method.scope
rename to data/fixtures/scopes/java/name/name.method.scope
diff --git a/data/fixtures/scopes/java/name.resource.scope b/data/fixtures/scopes/java/name/name.resource.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.resource.scope
rename to data/fixtures/scopes/java/name/name.resource.scope
diff --git a/data/fixtures/scopes/java/name.variable.scope b/data/fixtures/scopes/java/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/java/name.variable.scope
rename to data/fixtures/scopes/java/name/name.variable.scope
diff --git a/data/fixtures/scopes/java/statement.class.scope b/data/fixtures/scopes/java/statement/statement.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.class.scope
rename to data/fixtures/scopes/java/statement/statement.class.scope
diff --git a/data/fixtures/scopes/java/statement.class2.scope b/data/fixtures/scopes/java/statement/statement.class2.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.class2.scope
rename to data/fixtures/scopes/java/statement/statement.class2.scope
diff --git a/data/fixtures/scopes/java/statement.field.class.scope b/data/fixtures/scopes/java/statement/statement.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.field.class.scope
rename to data/fixtures/scopes/java/statement/statement.field.class.scope
diff --git a/data/fixtures/scopes/java/statement.field.interface.scope b/data/fixtures/scopes/java/statement/statement.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.field.interface.scope
rename to data/fixtures/scopes/java/statement/statement.field.interface.scope
diff --git a/data/fixtures/scopes/java/statement.interface.scope b/data/fixtures/scopes/java/statement/statement.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.interface.scope
rename to data/fixtures/scopes/java/statement/statement.interface.scope
diff --git a/data/fixtures/scopes/java/statement.interface2.scope b/data/fixtures/scopes/java/statement/statement.interface2.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.interface2.scope
rename to data/fixtures/scopes/java/statement/statement.interface2.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.block.scope b/data/fixtures/scopes/java/statement/statement.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.block.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.block.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.block2.scope b/data/fixtures/scopes/java/statement/statement.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.block2.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.block2.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.block3.scope b/data/fixtures/scopes/java/statement/statement.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.block3.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.block3.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.block4.scope b/data/fixtures/scopes/java/statement/statement.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.block4.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.block4.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.class.scope b/data/fixtures/scopes/java/statement/statement.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.class.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.class.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.class2.scope b/data/fixtures/scopes/java/statement/statement.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.class2.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.class2.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.document.scope b/data/fixtures/scopes/java/statement/statement.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.document.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.document.scope
diff --git a/data/fixtures/scopes/java/statement.iteration.interface.scope b/data/fixtures/scopes/java/statement/statement.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.iteration.interface.scope
rename to data/fixtures/scopes/java/statement/statement.iteration.interface.scope
diff --git a/data/fixtures/scopes/java/statement.scope b/data/fixtures/scopes/java/statement/statement.scope
similarity index 100%
rename from data/fixtures/scopes/java/statement.scope
rename to data/fixtures/scopes/java/statement/statement.scope
diff --git a/data/fixtures/scopes/java/type.argument.catch.scope b/data/fixtures/scopes/java/type/type.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.argument.catch.scope
rename to data/fixtures/scopes/java/type/type.argument.catch.scope
diff --git a/data/fixtures/scopes/java/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/type/type.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/java/type/type.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/java/type.argument.formal.constructor.scope b/data/fixtures/scopes/java/type/type.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.argument.formal.constructor.scope
rename to data/fixtures/scopes/java/type/type.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/java/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/java/type/type.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/java/type/type.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/java/type.argument.formal.method.scope b/data/fixtures/scopes/java/type/type.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.argument.formal.method.scope
rename to data/fixtures/scopes/java/type/type.argument.formal.method.scope
diff --git a/data/fixtures/scopes/java/type.cast.scope b/data/fixtures/scopes/java/type/type.cast.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.cast.scope
rename to data/fixtures/scopes/java/type/type.cast.scope
diff --git a/data/fixtures/scopes/java/type.class.scope b/data/fixtures/scopes/java/type/type.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.class.scope
rename to data/fixtures/scopes/java/type/type.class.scope
diff --git a/data/fixtures/scopes/java/type.enum.scope b/data/fixtures/scopes/java/type/type.enum.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.enum.scope
rename to data/fixtures/scopes/java/type/type.enum.scope
diff --git a/data/fixtures/scopes/java/type.field.class.scope b/data/fixtures/scopes/java/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.field.class.scope
rename to data/fixtures/scopes/java/type/type.field.class.scope
diff --git a/data/fixtures/scopes/java/type.field.interface.scope b/data/fixtures/scopes/java/type/type.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.field.interface.scope
rename to data/fixtures/scopes/java/type/type.field.interface.scope
diff --git a/data/fixtures/scopes/java/type.foreach.scope b/data/fixtures/scopes/java/type/type.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.foreach.scope
rename to data/fixtures/scopes/java/type/type.foreach.scope
diff --git a/data/fixtures/scopes/java/type.interface.scope b/data/fixtures/scopes/java/type/type.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.interface.scope
rename to data/fixtures/scopes/java/type/type.interface.scope
diff --git a/data/fixtures/scopes/java/type.iteration.block.scope b/data/fixtures/scopes/java/type/type.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.block.scope
rename to data/fixtures/scopes/java/type/type.iteration.block.scope
diff --git a/data/fixtures/scopes/java/type.iteration.block2.scope b/data/fixtures/scopes/java/type/type.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.block2.scope
rename to data/fixtures/scopes/java/type/type.iteration.block2.scope
diff --git a/data/fixtures/scopes/java/type.iteration.block3.scope b/data/fixtures/scopes/java/type/type.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.block3.scope
rename to data/fixtures/scopes/java/type/type.iteration.block3.scope
diff --git a/data/fixtures/scopes/java/type.iteration.block4.scope b/data/fixtures/scopes/java/type/type.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.block4.scope
rename to data/fixtures/scopes/java/type/type.iteration.block4.scope
diff --git a/data/fixtures/scopes/java/type.iteration.class.scope b/data/fixtures/scopes/java/type/type.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.class.scope
rename to data/fixtures/scopes/java/type/type.iteration.class.scope
diff --git a/data/fixtures/scopes/java/type.iteration.class2.scope b/data/fixtures/scopes/java/type/type.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.class2.scope
rename to data/fixtures/scopes/java/type/type.iteration.class2.scope
diff --git a/data/fixtures/scopes/java/type.iteration.document.scope b/data/fixtures/scopes/java/type/type.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.document.scope
rename to data/fixtures/scopes/java/type/type.iteration.document.scope
diff --git a/data/fixtures/scopes/java/type.iteration.interface.scope b/data/fixtures/scopes/java/type/type.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.iteration.interface.scope
rename to data/fixtures/scopes/java/type/type.iteration.interface.scope
diff --git a/data/fixtures/scopes/java/type.resource.scope b/data/fixtures/scopes/java/type/type.resource.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.resource.scope
rename to data/fixtures/scopes/java/type/type.resource.scope
diff --git a/data/fixtures/scopes/java/type.return.scope b/data/fixtures/scopes/java/type/type.return.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.return.scope
rename to data/fixtures/scopes/java/type/type.return.scope
diff --git a/data/fixtures/scopes/java/type.typeArgument.iteration.scope b/data/fixtures/scopes/java/type/type.typeArgument.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.typeArgument.iteration.scope
rename to data/fixtures/scopes/java/type/type.typeArgument.iteration.scope
diff --git a/data/fixtures/scopes/java/type.typeArgument.scope b/data/fixtures/scopes/java/type/type.typeArgument.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.typeArgument.scope
rename to data/fixtures/scopes/java/type/type.typeArgument.scope
diff --git a/data/fixtures/scopes/java/type.variable.scope b/data/fixtures/scopes/java/type/type.variable.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.variable.scope
rename to data/fixtures/scopes/java/type/type.variable.scope
diff --git a/data/fixtures/scopes/java/type.variable2.scope b/data/fixtures/scopes/java/type/type.variable2.scope
similarity index 100%
rename from data/fixtures/scopes/java/type.variable2.scope
rename to data/fixtures/scopes/java/type/type.variable2.scope
diff --git a/data/fixtures/scopes/java/value.assignment.scope b/data/fixtures/scopes/java/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.assignment.scope
rename to data/fixtures/scopes/java/value/value.assignment.scope
diff --git a/data/fixtures/scopes/java/value.field.class.scope b/data/fixtures/scopes/java/value/value.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.field.class.scope
rename to data/fixtures/scopes/java/value/value.field.class.scope
diff --git a/data/fixtures/scopes/java/value.foreach.scope b/data/fixtures/scopes/java/value/value.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.foreach.scope
rename to data/fixtures/scopes/java/value/value.foreach.scope
diff --git a/data/fixtures/scopes/java/value.iteration.block.scope b/data/fixtures/scopes/java/value/value.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.block.scope
rename to data/fixtures/scopes/java/value/value.iteration.block.scope
diff --git a/data/fixtures/scopes/java/value.iteration.block2.scope b/data/fixtures/scopes/java/value/value.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.block2.scope
rename to data/fixtures/scopes/java/value/value.iteration.block2.scope
diff --git a/data/fixtures/scopes/java/value.iteration.block3.scope b/data/fixtures/scopes/java/value/value.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.block3.scope
rename to data/fixtures/scopes/java/value/value.iteration.block3.scope
diff --git a/data/fixtures/scopes/java/value.iteration.block4.scope b/data/fixtures/scopes/java/value/value.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.block4.scope
rename to data/fixtures/scopes/java/value/value.iteration.block4.scope
diff --git a/data/fixtures/scopes/java/value.iteration.class.scope b/data/fixtures/scopes/java/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.class.scope
rename to data/fixtures/scopes/java/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/java/value.iteration.class2.scope b/data/fixtures/scopes/java/value/value.iteration.class2.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.class2.scope
rename to data/fixtures/scopes/java/value/value.iteration.class2.scope
diff --git a/data/fixtures/scopes/java/value.iteration.document.scope b/data/fixtures/scopes/java/value/value.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.iteration.document.scope
rename to data/fixtures/scopes/java/value/value.iteration.document.scope
diff --git a/data/fixtures/scopes/java/value.resource.scope b/data/fixtures/scopes/java/value/value.resource.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.resource.scope
rename to data/fixtures/scopes/java/value/value.resource.scope
diff --git a/data/fixtures/scopes/java/value.return.lambda.scope b/data/fixtures/scopes/java/value/value.return.lambda.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.return.lambda.scope
rename to data/fixtures/scopes/java/value/value.return.lambda.scope
diff --git a/data/fixtures/scopes/java/value.return.scope b/data/fixtures/scopes/java/value/value.return.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.return.scope
rename to data/fixtures/scopes/java/value/value.return.scope
diff --git a/data/fixtures/scopes/java/value.variable.scope b/data/fixtures/scopes/java/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/java/value.variable.scope
rename to data/fixtures/scopes/java/value/value.variable.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.method.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.catch.scope b/data/fixtures/scopes/javascript.core/argument/argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.catch.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.catch.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.lambda.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.iteration2.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.lambda.iteration2.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration2.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.lambda.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine2.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine2.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine2.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.method.iteration.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope
rename to data/fixtures/scopes/javascript.core/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.if.elif.else.scope b/data/fixtures/scopes/javascript.core/branch/branch.if.elif.else.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.if.elif.else.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.if.elif.else.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.if.else.scope b/data/fixtures/scopes/javascript.core/branch/branch.if.else.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.if.else.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.if.else.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.if.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.if.iteration.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.if.scope b/data/fixtures/scopes/javascript.core/branch/branch.if.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.if.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.if.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.switchCase.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.switchCase.iteration.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.switchCase.scope b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.switchCase.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.ternary.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.ternary.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.ternary.iteration.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.ternary.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.ternary.scope b/data/fixtures/scopes/javascript.core/branch/branch.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.ternary.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.ternary.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.try.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.try.iteration.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/branch.try.scope b/data/fixtures/scopes/javascript.core/branch/branch.try.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/branch.try.scope
rename to data/fixtures/scopes/javascript.core/branch/branch.try.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.doWhile.scope b/data/fixtures/scopes/javascript.core/condition/condition.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.doWhile.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.doWhile.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.for.scope b/data/fixtures/scopes/javascript.core/condition/condition.for.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.for.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.for.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.if.scope b/data/fixtures/scopes/javascript.core/condition/condition.if.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.if.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.if.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.switchCase.iteration.scope b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.switchCase.iteration.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.switchCase.scope b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.switchCase.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.ternary.scope b/data/fixtures/scopes/javascript.core/condition/condition.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.ternary.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.ternary.scope
diff --git a/data/fixtures/scopes/javascript.core/condition.while.scope b/data/fixtures/scopes/javascript.core/condition/condition.while.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/condition.while.scope
rename to data/fixtures/scopes/javascript.core/condition/condition.while.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName.constructor.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName.constructor.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName.constructor.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName.iteration.document.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName.iteration.document.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName.method.iteration.class.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.method.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName.method.iteration.class.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName.method.iteration.class.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName.method.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.method.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName.method.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName.method.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName2.scope b/data/fixtures/scopes/javascript.core/functionName/functionName2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName2.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName2.scope
diff --git a/data/fixtures/scopes/javascript.core/functionName3.scope b/data/fixtures/scopes/javascript.core/functionName/functionName3.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/functionName3.scope
rename to data/fixtures/scopes/javascript.core/functionName/functionName3.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.class.scope b/data/fixtures/scopes/javascript.core/interior/interior.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.class.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.class.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.constructor.scope b/data/fixtures/scopes/javascript.core/interior/interior.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.constructor.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.constructor.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.doWhile.scope b/data/fixtures/scopes/javascript.core/interior/interior.doWhile.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.doWhile.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.doWhile.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.for.scope b/data/fixtures/scopes/javascript.core/interior/interior.for.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.for.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.for.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.foreach.scope b/data/fixtures/scopes/javascript.core/interior/interior.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.foreach.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.foreach.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.foreach2.scope b/data/fixtures/scopes/javascript.core/interior/interior.foreach2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.foreach2.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.foreach2.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.function.scope b/data/fixtures/scopes/javascript.core/interior/interior.function.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.function.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.function.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.if.scope b/data/fixtures/scopes/javascript.core/interior/interior.if.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.if.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.if.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.lambda.block.scope b/data/fixtures/scopes/javascript.core/interior/interior.lambda.block.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.lambda.block.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.lambda.block.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.lambda.expression.scope b/data/fixtures/scopes/javascript.core/interior/interior.lambda.expression.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.lambda.expression.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.method.scope b/data/fixtures/scopes/javascript.core/interior/interior.method.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.method.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.method.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.static.scope b/data/fixtures/scopes/javascript.core/interior/interior.static.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.static.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.static.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.switch.scope b/data/fixtures/scopes/javascript.core/interior/interior.switch.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.switch.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.switch.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.switchCase.scope b/data/fixtures/scopes/javascript.core/interior/interior.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.switchCase.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.switchCase.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.ternary.scope b/data/fixtures/scopes/javascript.core/interior/interior.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.ternary.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.try.scope b/data/fixtures/scopes/javascript.core/interior/interior.try.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.try.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.try.scope
diff --git a/data/fixtures/scopes/javascript.core/interior.while.scope b/data/fixtures/scopes/javascript.core/interior/interior.while.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/interior.while.scope
rename to data/fixtures/scopes/javascript.core/interior/interior.while.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.catch.scope b/data/fixtures/scopes/javascript.core/name/name.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.catch.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.catch.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.constructor.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.constructor2.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.constructor2.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor2.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.iteration.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.method.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.method.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.method2.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.method2.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.method2.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/javascript.core/name.argument.formal2.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.argument.formal2.scope
rename to data/fixtures/scopes/javascript.core/name/name.argument.formal2.scope
diff --git a/data/fixtures/scopes/javascript.core/name.assignment.pattern.scope b/data/fixtures/scopes/javascript.core/name/name.assignment.pattern.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.assignment.pattern.scope
rename to data/fixtures/scopes/javascript.core/name/name.assignment.pattern.scope
diff --git a/data/fixtures/scopes/javascript.core/name.assignment.scope b/data/fixtures/scopes/javascript.core/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.assignment.scope
rename to data/fixtures/scopes/javascript.core/name/name.assignment.scope
diff --git a/data/fixtures/scopes/javascript.core/name.class.scope b/data/fixtures/scopes/javascript.core/name/name.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.class.scope
rename to data/fixtures/scopes/javascript.core/name/name.class.scope
diff --git a/data/fixtures/scopes/javascript.core/name.constructor.scope b/data/fixtures/scopes/javascript.core/name/name.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.constructor.scope
rename to data/fixtures/scopes/javascript.core/name/name.constructor.scope
diff --git a/data/fixtures/scopes/javascript.core/name.field.class.scope b/data/fixtures/scopes/javascript.core/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.field.class.scope
rename to data/fixtures/scopes/javascript.core/name/name.field.class.scope
diff --git a/data/fixtures/scopes/javascript.core/name.foreach.scope b/data/fixtures/scopes/javascript.core/name/name.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.foreach.scope
rename to data/fixtures/scopes/javascript.core/name/name.foreach.scope
diff --git a/data/fixtures/scopes/javascript.core/name.function.scope b/data/fixtures/scopes/javascript.core/name/name.function.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.function.scope
rename to data/fixtures/scopes/javascript.core/name/name.function.scope
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.block.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.iteration.block.scope
rename to data/fixtures/scopes/javascript.core/name/name.iteration.block.scope
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.block2.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.iteration.block2.scope
rename to data/fixtures/scopes/javascript.core/name/name.iteration.block2.scope
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.block3.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.iteration.block3.scope
rename to data/fixtures/scopes/javascript.core/name/name.iteration.block3.scope
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.block4.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.iteration.block4.scope
rename to data/fixtures/scopes/javascript.core/name/name.iteration.block4.scope
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.class.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.iteration.class.scope
rename to data/fixtures/scopes/javascript.core/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.document.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.iteration.document.scope
rename to data/fixtures/scopes/javascript.core/name/name.iteration.document.scope
diff --git a/data/fixtures/scopes/javascript.core/name.method.scope b/data/fixtures/scopes/javascript.core/name/name.method.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.method.scope
rename to data/fixtures/scopes/javascript.core/name/name.method.scope
diff --git a/data/fixtures/scopes/javascript.core/name.variable.pattern.scope b/data/fixtures/scopes/javascript.core/name/name.variable.pattern.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.variable.pattern.scope
rename to data/fixtures/scopes/javascript.core/name/name.variable.pattern.scope
diff --git a/data/fixtures/scopes/javascript.core/name.variable.pattern2.scope b/data/fixtures/scopes/javascript.core/name/name.variable.pattern2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.variable.pattern2.scope
rename to data/fixtures/scopes/javascript.core/name/name.variable.pattern2.scope
diff --git a/data/fixtures/scopes/javascript.core/name.variable.pattern3.scope b/data/fixtures/scopes/javascript.core/name/name.variable.pattern3.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.variable.pattern3.scope
rename to data/fixtures/scopes/javascript.core/name/name.variable.pattern3.scope
diff --git a/data/fixtures/scopes/javascript.core/name.variable.scope b/data/fixtures/scopes/javascript.core/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/name.variable.scope
rename to data/fixtures/scopes/javascript.core/name/name.variable.scope
diff --git a/data/fixtures/scopes/javascript.core/namedFunction.constructor.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/namedFunction.constructor.scope
rename to data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope
diff --git a/data/fixtures/scopes/javascript.core/namedFunction.iteration.document.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/namedFunction.iteration.document.scope
rename to data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope
diff --git a/data/fixtures/scopes/javascript.core/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/namedFunction.method.iteration.class.scope
rename to data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.iteration.class.scope
diff --git a/data/fixtures/scopes/javascript.core/namedFunction.method.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/namedFunction.method.scope
rename to data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.scope
diff --git a/data/fixtures/scopes/javascript.core/namedFunction.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/namedFunction.scope
rename to data/fixtures/scopes/javascript.core/namedFunction/namedFunction.scope
diff --git a/data/fixtures/scopes/javascript.core/namedFunction2.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/namedFunction2.scope
rename to data/fixtures/scopes/javascript.core/namedFunction/namedFunction2.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.class.scope b/data/fixtures/scopes/javascript.core/statement/statement.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.class.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.class.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.field.class.scope b/data/fixtures/scopes/javascript.core/statement/statement.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.field.class.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.field.class.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.iteration.block.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.iteration.block.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.iteration.block.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.iteration.block2.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.iteration.block2.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.iteration.block2.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.iteration.block3.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.iteration.block3.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.iteration.block3.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.iteration.block4.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.iteration.block4.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.iteration.block4.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.iteration.class.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.iteration.class.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.iteration.class.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.iteration.document.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.iteration.document.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.iteration.document.scope
diff --git a/data/fixtures/scopes/javascript.core/statement.scope b/data/fixtures/scopes/javascript.core/statement/statement.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/statement.scope
rename to data/fixtures/scopes/javascript.core/statement/statement.scope
diff --git a/data/fixtures/scopes/javascript.core/textFragment.comment.block.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/textFragment.comment.block.scope
rename to data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block.scope
diff --git a/data/fixtures/scopes/javascript.core/textFragment.comment.block2.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/textFragment.comment.block2.scope
rename to data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block2.scope
diff --git a/data/fixtures/scopes/javascript.core/textFragment.comment.line.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.line.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/textFragment.comment.line.scope
rename to data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.line.scope
diff --git a/data/fixtures/scopes/javascript.core/textFragment.string.multiLine.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.string.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/textFragment.string.multiLine.scope
rename to data/fixtures/scopes/javascript.core/textFragment/textFragment.string.multiLine.scope
diff --git a/data/fixtures/scopes/javascript.core/textFragment.string.singleLine.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.string.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/textFragment.string.singleLine.scope
rename to data/fixtures/scopes/javascript.core/textFragment/textFragment.string.singleLine.scope
diff --git a/data/fixtures/scopes/javascript.core/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/value.argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.argument.formal.constructor.scope
rename to data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/javascript.core/value.argument.formal.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.argument.formal.iteration.scope
rename to data/fixtures/scopes/javascript.core/value/value.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/value.argument.formal.method.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.argument.formal.method.scope
rename to data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope
diff --git a/data/fixtures/scopes/javascript.core/value.argument.formal.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.argument.formal.scope
rename to data/fixtures/scopes/javascript.core/value/value.argument.formal.scope
diff --git a/data/fixtures/scopes/javascript.core/value.assignment.scope b/data/fixtures/scopes/javascript.core/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.assignment.scope
rename to data/fixtures/scopes/javascript.core/value/value.assignment.scope
diff --git a/data/fixtures/scopes/javascript.core/value.field.class.scope b/data/fixtures/scopes/javascript.core/value/value.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.field.class.scope
rename to data/fixtures/scopes/javascript.core/value/value.field.class.scope
diff --git a/data/fixtures/scopes/javascript.core/value.foreach.scope b/data/fixtures/scopes/javascript.core/value/value.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.foreach.scope
rename to data/fixtures/scopes/javascript.core/value/value.foreach.scope
diff --git a/data/fixtures/scopes/javascript.core/value.iteration.block.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.iteration.block.scope
rename to data/fixtures/scopes/javascript.core/value/value.iteration.block.scope
diff --git a/data/fixtures/scopes/javascript.core/value.iteration.block2.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.iteration.block2.scope
rename to data/fixtures/scopes/javascript.core/value/value.iteration.block2.scope
diff --git a/data/fixtures/scopes/javascript.core/value.iteration.block3.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.iteration.block3.scope
rename to data/fixtures/scopes/javascript.core/value/value.iteration.block3.scope
diff --git a/data/fixtures/scopes/javascript.core/value.iteration.class.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.iteration.class.scope
rename to data/fixtures/scopes/javascript.core/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/javascript.core/value.iteration.document.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.iteration.document.scope
rename to data/fixtures/scopes/javascript.core/value/value.iteration.document.scope
diff --git a/data/fixtures/scopes/javascript.core/value.mapPair.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.mapPair.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.mapPair.iteration.scope
rename to data/fixtures/scopes/javascript.core/value/value.mapPair.iteration.scope
diff --git a/data/fixtures/scopes/javascript.core/value.mapPair.scope b/data/fixtures/scopes/javascript.core/value/value.mapPair.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.mapPair.scope
rename to data/fixtures/scopes/javascript.core/value/value.mapPair.scope
diff --git a/data/fixtures/scopes/javascript.core/value.return.lambda.scope b/data/fixtures/scopes/javascript.core/value/value.return.lambda.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.return.lambda.scope
rename to data/fixtures/scopes/javascript.core/value/value.return.lambda.scope
diff --git a/data/fixtures/scopes/javascript.core/value.return.scope b/data/fixtures/scopes/javascript.core/value/value.return.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.return.scope
rename to data/fixtures/scopes/javascript.core/value/value.return.scope
diff --git a/data/fixtures/scopes/javascript.core/value.variable.pattern.scope b/data/fixtures/scopes/javascript.core/value/value.variable.pattern.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.variable.pattern.scope
rename to data/fixtures/scopes/javascript.core/value/value.variable.pattern.scope
diff --git a/data/fixtures/scopes/javascript.core/value.variable.pattern2.scope b/data/fixtures/scopes/javascript.core/value/value.variable.pattern2.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.variable.pattern2.scope
rename to data/fixtures/scopes/javascript.core/value/value.variable.pattern2.scope
diff --git a/data/fixtures/scopes/javascript.core/value.variable.scope b/data/fixtures/scopes/javascript.core/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.variable.scope
rename to data/fixtures/scopes/javascript.core/value/value.variable.scope
diff --git a/data/fixtures/scopes/javascript.core/value.yield.scope b/data/fixtures/scopes/javascript.core/value/value.yield.scope
similarity index 100%
rename from data/fixtures/scopes/javascript.core/value.yield.scope
rename to data/fixtures/scopes/javascript.core/value/value.yield.scope
diff --git a/data/fixtures/scopes/php/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.constructor.iteration.scope
rename to data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope
diff --git a/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/php/argument/argument.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/php/argument/argument.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/php/argument/argument.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/php/argument/argument.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/php/argument.actual.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.iteration.scope
rename to data/fixtures/scopes/php/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/php/argument.actual.method.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.method.iteration.scope
rename to data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope
diff --git a/data/fixtures/scopes/php/argument.actual.method.multiLine.scope b/data/fixtures/scopes/php/argument/argument.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.method.multiLine.scope
rename to data/fixtures/scopes/php/argument/argument.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/php/argument.actual.method.singleLine.scope b/data/fixtures/scopes/php/argument/argument.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.method.singleLine.scope
rename to data/fixtures/scopes/php/argument/argument.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/php/argument.actual.multiLine.scope b/data/fixtures/scopes/php/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.multiLine.scope
rename to data/fixtures/scopes/php/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/php/argument.actual.singleLine.scope b/data/fixtures/scopes/php/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.actual.singleLine.scope
rename to data/fixtures/scopes/php/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/php/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/php/argument/argument.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/php/argument/argument.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/php/argument/argument.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/php/argument/argument.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/php/argument.formal.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.iteration.scope
rename to data/fixtures/scopes/php/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/php/argument.formal.method.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.method.iteration.scope
rename to data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/php/argument.formal.method.multiLine.scope b/data/fixtures/scopes/php/argument/argument.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.method.multiLine.scope
rename to data/fixtures/scopes/php/argument/argument.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/php/argument.formal.method.singleLine.scope b/data/fixtures/scopes/php/argument/argument.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.method.singleLine.scope
rename to data/fixtures/scopes/php/argument/argument.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/php/argument.formal.multiLine.scope b/data/fixtures/scopes/php/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.multiLine.scope
rename to data/fixtures/scopes/php/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/php/argument.formal.singleLine.scope b/data/fixtures/scopes/php/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/php/argument.formal.singleLine.scope
rename to data/fixtures/scopes/php/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/php/name.argument.formal.iteration.scope b/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.argument.formal.iteration.scope
rename to data/fixtures/scopes/php/name/name.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/php/name.argument.formal.scope b/data/fixtures/scopes/php/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.argument.formal.scope
rename to data/fixtures/scopes/php/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/php/name.argument.formal2.scope b/data/fixtures/scopes/php/name/name.argument.formal2.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.argument.formal2.scope
rename to data/fixtures/scopes/php/name/name.argument.formal2.scope
diff --git a/data/fixtures/scopes/php/name.assignment.scope b/data/fixtures/scopes/php/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.assignment.scope
rename to data/fixtures/scopes/php/name/name.assignment.scope
diff --git a/data/fixtures/scopes/php/name.assignment2.scope b/data/fixtures/scopes/php/name/name.assignment2.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.assignment2.scope
rename to data/fixtures/scopes/php/name/name.assignment2.scope
diff --git a/data/fixtures/scopes/php/name.field.class.scope b/data/fixtures/scopes/php/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.field.class.scope
rename to data/fixtures/scopes/php/name/name.field.class.scope
diff --git a/data/fixtures/scopes/php/name.variable.scope b/data/fixtures/scopes/php/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/php/name.variable.scope
rename to data/fixtures/scopes/php/name/name.variable.scope
diff --git a/data/fixtures/scopes/php/type.argument.formal.iteration.scope b/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/php/type.argument.formal.iteration.scope
rename to data/fixtures/scopes/php/type/type.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/php/type.argument.formal.scope b/data/fixtures/scopes/php/type/type.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/php/type.argument.formal.scope
rename to data/fixtures/scopes/php/type/type.argument.formal.scope
diff --git a/data/fixtures/scopes/php/type.argument.formal2.scope b/data/fixtures/scopes/php/type/type.argument.formal2.scope
similarity index 100%
rename from data/fixtures/scopes/php/type.argument.formal2.scope
rename to data/fixtures/scopes/php/type/type.argument.formal2.scope
diff --git a/data/fixtures/scopes/php/type.argument.formal3.scope b/data/fixtures/scopes/php/type/type.argument.formal3.scope
similarity index 100%
rename from data/fixtures/scopes/php/type.argument.formal3.scope
rename to data/fixtures/scopes/php/type/type.argument.formal3.scope
diff --git a/data/fixtures/scopes/php/type.cast.scope b/data/fixtures/scopes/php/type/type.cast.scope
similarity index 100%
rename from data/fixtures/scopes/php/type.cast.scope
rename to data/fixtures/scopes/php/type/type.cast.scope
diff --git a/data/fixtures/scopes/php/type.field.class.scope b/data/fixtures/scopes/php/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/php/type.field.class.scope
rename to data/fixtures/scopes/php/type/type.field.class.scope
diff --git a/data/fixtures/scopes/php/value.assignment.scope b/data/fixtures/scopes/php/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/php/value.assignment.scope
rename to data/fixtures/scopes/php/value/value.assignment.scope
diff --git a/data/fixtures/scopes/php/value.assignment2.scope b/data/fixtures/scopes/php/value/value.assignment2.scope
similarity index 100%
rename from data/fixtures/scopes/php/value.assignment2.scope
rename to data/fixtures/scopes/php/value/value.assignment2.scope
diff --git a/data/fixtures/scopes/php/value.mapPair.scope b/data/fixtures/scopes/php/value/value.mapPair.scope
similarity index 100%
rename from data/fixtures/scopes/php/value.mapPair.scope
rename to data/fixtures/scopes/php/value/value.mapPair.scope
diff --git a/data/fixtures/scopes/php/value.return.scope b/data/fixtures/scopes/php/value/value.return.scope
similarity index 100%
rename from data/fixtures/scopes/php/value.return.scope
rename to data/fixtures/scopes/php/value/value.return.scope
diff --git a/data/fixtures/scopes/php/value.variable.scope b/data/fixtures/scopes/php/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/php/value.variable.scope
rename to data/fixtures/scopes/php/value/value.variable.scope
diff --git a/data/fixtures/scopes/php/value.yield.scope b/data/fixtures/scopes/php/value/value.yield.scope
similarity index 100%
rename from data/fixtures/scopes/php/value.yield.scope
rename to data/fixtures/scopes/php/value/value.yield.scope
diff --git a/data/fixtures/scopes/python/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.constructor.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/python/argument/argument.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/python/argument/argument.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/python/argument/argument.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/python/argument.actual.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.actual.method.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.method.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.actual.method.multiLine.scope b/data/fixtures/scopes/python/argument/argument.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.method.multiLine.scope
rename to data/fixtures/scopes/python/argument/argument.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/python/argument.actual.method.singleLine.scope b/data/fixtures/scopes/python/argument/argument.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.method.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/python/argument.actual.multiLine.scope b/data/fixtures/scopes/python/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.multiLine.scope
rename to data/fixtures/scopes/python/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/python/argument.actual.singleLine.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/python/argument.actual.singleLine2.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.singleLine2.scope
rename to data/fixtures/scopes/python/argument/argument.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/python/argument.actual.singleLine3.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine3.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.singleLine3.scope
rename to data/fixtures/scopes/python/argument/argument.actual.singleLine3.scope
diff --git a/data/fixtures/scopes/python/argument.actual.singleLine4.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine4.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.actual.singleLine4.scope
rename to data/fixtures/scopes/python/argument/argument.actual.singleLine4.scope
diff --git a/data/fixtures/scopes/python/argument.catch.scope b/data/fixtures/scopes/python/argument/argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.catch.scope
rename to data/fixtures/scopes/python/argument/argument.catch.scope
diff --git a/data/fixtures/scopes/python/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/python/argument/argument.formal.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.constructor.multiLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/python/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.constructor.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/python/argument.formal.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.lambda.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.lambda.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.lambda.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.lambda.singleLine.scope
diff --git a/data/fixtures/scopes/python/argument.formal.method.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.method.iteration.scope
rename to data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/python/argument.formal.method.multiLine.scope b/data/fixtures/scopes/python/argument/argument.formal.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.method.multiLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.method.multiLine.scope
diff --git a/data/fixtures/scopes/python/argument.formal.method.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.method.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.method.singleLine.scope
diff --git a/data/fixtures/scopes/python/argument.formal.multiLine.scope b/data/fixtures/scopes/python/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.multiLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/python/argument.formal.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argument.formal.singleLine.scope
rename to data/fixtures/scopes/python/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.constructor.empty.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.constructor.empty.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.constructor.empty.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.constructor.empty.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.constructor.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.constructor.multiLine.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.constructor.multiLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.constructor.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.constructor.singleLine.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.constructor.singleLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.empty.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.empty.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.empty.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.empty.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.method.empty.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.method.empty.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.method.empty.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.method.empty.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.method.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.method.multiLine.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.method.multiLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.method.singleLine.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.multiLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.multiLine.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.multiLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.singleLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.singleLine.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine.scope
diff --git a/data/fixtures/scopes/python/argumentList.actual.singleLine2.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/python/argumentList.actual.singleLine2.scope
rename to data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/python/branch.if.elif.else.scope b/data/fixtures/scopes/python/branch/branch.if.elif.else.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.if.elif.else.scope
rename to data/fixtures/scopes/python/branch/branch.if.elif.else.scope
diff --git a/data/fixtures/scopes/python/branch.if.else.scope b/data/fixtures/scopes/python/branch/branch.if.else.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.if.else.scope
rename to data/fixtures/scopes/python/branch/branch.if.else.scope
diff --git a/data/fixtures/scopes/python/branch.if.iteration.scope b/data/fixtures/scopes/python/branch/branch.if.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.if.iteration.scope
rename to data/fixtures/scopes/python/branch/branch.if.iteration.scope
diff --git a/data/fixtures/scopes/python/branch.if.scope b/data/fixtures/scopes/python/branch/branch.if.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.if.scope
rename to data/fixtures/scopes/python/branch/branch.if.scope
diff --git a/data/fixtures/scopes/python/branch.loop.iteration.scope b/data/fixtures/scopes/python/branch/branch.loop.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.loop.iteration.scope
rename to data/fixtures/scopes/python/branch/branch.loop.iteration.scope
diff --git a/data/fixtures/scopes/python/branch.loop.iteration2.scope b/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.loop.iteration2.scope
rename to data/fixtures/scopes/python/branch/branch.loop.iteration2.scope
diff --git a/data/fixtures/scopes/python/branch.loop.scope b/data/fixtures/scopes/python/branch/branch.loop.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.loop.scope
rename to data/fixtures/scopes/python/branch/branch.loop.scope
diff --git a/data/fixtures/scopes/python/branch.loop2.scope b/data/fixtures/scopes/python/branch/branch.loop2.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.loop2.scope
rename to data/fixtures/scopes/python/branch/branch.loop2.scope
diff --git a/data/fixtures/scopes/python/branch.switchCase.iteration.scope b/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.switchCase.iteration.scope
rename to data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/python/branch.switchCase.scope b/data/fixtures/scopes/python/branch/branch.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.switchCase.scope
rename to data/fixtures/scopes/python/branch/branch.switchCase.scope
diff --git a/data/fixtures/scopes/python/branch.ternary.iteration.scope b/data/fixtures/scopes/python/branch/branch.ternary.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.ternary.iteration.scope
rename to data/fixtures/scopes/python/branch/branch.ternary.iteration.scope
diff --git a/data/fixtures/scopes/python/branch.ternary.scope b/data/fixtures/scopes/python/branch/branch.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.ternary.scope
rename to data/fixtures/scopes/python/branch/branch.ternary.scope
diff --git a/data/fixtures/scopes/python/branch.try.iteration.scope b/data/fixtures/scopes/python/branch/branch.try.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.try.iteration.scope
rename to data/fixtures/scopes/python/branch/branch.try.iteration.scope
diff --git a/data/fixtures/scopes/python/branch.try.scope b/data/fixtures/scopes/python/branch/branch.try.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.try.scope
rename to data/fixtures/scopes/python/branch/branch.try.scope
diff --git a/data/fixtures/scopes/python/branch.try2.scope b/data/fixtures/scopes/python/branch/branch.try2.scope
similarity index 100%
rename from data/fixtures/scopes/python/branch.try2.scope
rename to data/fixtures/scopes/python/branch/branch.try2.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed.iteration.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration2.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed.iteration2.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration2.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration3.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration3.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration4.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration4.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed.iteration4.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration4.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed2.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed2.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed2.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed2.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed3.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed3.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed3.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed3.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed4.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed4.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed4.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed4.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed5.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed5.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed5.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed5.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed6.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed6.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed6.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed6.scope
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed7.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed7.scope
similarity index 100%
rename from data/fixtures/scopes/python/collectionItem.unenclosed7.scope
rename to data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed7.scope
diff --git a/data/fixtures/scopes/python/condition.if.scope b/data/fixtures/scopes/python/condition/condition.if.scope
similarity index 100%
rename from data/fixtures/scopes/python/condition.if.scope
rename to data/fixtures/scopes/python/condition/condition.if.scope
diff --git a/data/fixtures/scopes/python/condition.switchCase.iteration.scope b/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/condition.switchCase.iteration.scope
rename to data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope
diff --git a/data/fixtures/scopes/python/condition.switchCase.scope b/data/fixtures/scopes/python/condition/condition.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/python/condition.switchCase.scope
rename to data/fixtures/scopes/python/condition/condition.switchCase.scope
diff --git a/data/fixtures/scopes/python/condition.ternary.scope b/data/fixtures/scopes/python/condition/condition.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/python/condition.ternary.scope
rename to data/fixtures/scopes/python/condition/condition.ternary.scope
diff --git a/data/fixtures/scopes/python/condition.while.scope b/data/fixtures/scopes/python/condition/condition.while.scope
similarity index 100%
rename from data/fixtures/scopes/python/condition.while.scope
rename to data/fixtures/scopes/python/condition/condition.while.scope
diff --git a/data/fixtures/scopes/python/functionName.constructor.scope b/data/fixtures/scopes/python/functionName/functionName.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/functionName.constructor.scope
rename to data/fixtures/scopes/python/functionName/functionName.constructor.scope
diff --git a/data/fixtures/scopes/python/functionName.iteration.document.scope b/data/fixtures/scopes/python/functionName/functionName.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/python/functionName.iteration.document.scope
rename to data/fixtures/scopes/python/functionName/functionName.iteration.document.scope
diff --git a/data/fixtures/scopes/python/functionName.method.iteration.class.scope b/data/fixtures/scopes/python/functionName/functionName.method.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/functionName.method.iteration.class.scope
rename to data/fixtures/scopes/python/functionName/functionName.method.iteration.class.scope
diff --git a/data/fixtures/scopes/python/functionName.method.scope b/data/fixtures/scopes/python/functionName/functionName.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/functionName.method.scope
rename to data/fixtures/scopes/python/functionName/functionName.method.scope
diff --git a/data/fixtures/scopes/python/functionName.scope b/data/fixtures/scopes/python/functionName/functionName.scope
similarity index 100%
rename from data/fixtures/scopes/python/functionName.scope
rename to data/fixtures/scopes/python/functionName/functionName.scope
diff --git a/data/fixtures/scopes/python/interior.class.scope b/data/fixtures/scopes/python/interior/interior.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.class.scope
rename to data/fixtures/scopes/python/interior/interior.class.scope
diff --git a/data/fixtures/scopes/python/interior.constructor.scope b/data/fixtures/scopes/python/interior/interior.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.constructor.scope
rename to data/fixtures/scopes/python/interior/interior.constructor.scope
diff --git a/data/fixtures/scopes/python/interior.foreach.scope b/data/fixtures/scopes/python/interior/interior.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.foreach.scope
rename to data/fixtures/scopes/python/interior/interior.foreach.scope
diff --git a/data/fixtures/scopes/python/interior.function.scope b/data/fixtures/scopes/python/interior/interior.function.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.function.scope
rename to data/fixtures/scopes/python/interior/interior.function.scope
diff --git a/data/fixtures/scopes/python/interior.function2.scope b/data/fixtures/scopes/python/interior/interior.function2.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.function2.scope
rename to data/fixtures/scopes/python/interior/interior.function2.scope
diff --git a/data/fixtures/scopes/python/interior.if.scope b/data/fixtures/scopes/python/interior/interior.if.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.if.scope
rename to data/fixtures/scopes/python/interior/interior.if.scope
diff --git a/data/fixtures/scopes/python/interior.lambda.expression.scope b/data/fixtures/scopes/python/interior/interior.lambda.expression.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.lambda.expression.scope
rename to data/fixtures/scopes/python/interior/interior.lambda.expression.scope
diff --git a/data/fixtures/scopes/python/interior.lambda.expression2.scope b/data/fixtures/scopes/python/interior/interior.lambda.expression2.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.lambda.expression2.scope
rename to data/fixtures/scopes/python/interior/interior.lambda.expression2.scope
diff --git a/data/fixtures/scopes/python/interior.method.scope b/data/fixtures/scopes/python/interior/interior.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.method.scope
rename to data/fixtures/scopes/python/interior/interior.method.scope
diff --git a/data/fixtures/scopes/python/interior.resource.scope b/data/fixtures/scopes/python/interior/interior.resource.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.resource.scope
rename to data/fixtures/scopes/python/interior/interior.resource.scope
diff --git a/data/fixtures/scopes/python/interior.switch.scope b/data/fixtures/scopes/python/interior/interior.switch.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.switch.scope
rename to data/fixtures/scopes/python/interior/interior.switch.scope
diff --git a/data/fixtures/scopes/python/interior.switchCase.scope b/data/fixtures/scopes/python/interior/interior.switchCase.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.switchCase.scope
rename to data/fixtures/scopes/python/interior/interior.switchCase.scope
diff --git a/data/fixtures/scopes/python/interior.ternary.scope b/data/fixtures/scopes/python/interior/interior.ternary.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.ternary.scope
rename to data/fixtures/scopes/python/interior/interior.ternary.scope
diff --git a/data/fixtures/scopes/python/interior.try.scope b/data/fixtures/scopes/python/interior/interior.try.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.try.scope
rename to data/fixtures/scopes/python/interior/interior.try.scope
diff --git a/data/fixtures/scopes/python/interior.try2.scope b/data/fixtures/scopes/python/interior/interior.try2.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.try2.scope
rename to data/fixtures/scopes/python/interior/interior.try2.scope
diff --git a/data/fixtures/scopes/python/interior.while.scope b/data/fixtures/scopes/python/interior/interior.while.scope
similarity index 100%
rename from data/fixtures/scopes/python/interior.while.scope
rename to data/fixtures/scopes/python/interior/interior.while.scope
diff --git a/data/fixtures/scopes/python/name.argument.actual.iteration.scope b/data/fixtures/scopes/python/name/name.argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.actual.iteration.scope
rename to data/fixtures/scopes/python/name/name.argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/python/name.argument.actual.scope b/data/fixtures/scopes/python/name/name.argument.actual.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.actual.scope
rename to data/fixtures/scopes/python/name/name.argument.actual.scope
diff --git a/data/fixtures/scopes/python/name.argument.catch.scope b/data/fixtures/scopes/python/name/name.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.catch.scope
rename to data/fixtures/scopes/python/name/name.argument.catch.scope
diff --git a/data/fixtures/scopes/python/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/python/name/name.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/python/name.argument.formal.constructor.scope b/data/fixtures/scopes/python/name/name.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.formal.constructor.scope
rename to data/fixtures/scopes/python/name/name.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/python/name.argument.formal.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.formal.iteration.scope
rename to data/fixtures/scopes/python/name/name.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/python/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/python/name/name.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/python/name.argument.formal.method.scope b/data/fixtures/scopes/python/name/name.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.formal.method.scope
rename to data/fixtures/scopes/python/name/name.argument.formal.method.scope
diff --git a/data/fixtures/scopes/python/name.argument.formal.scope b/data/fixtures/scopes/python/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.argument.formal.scope
rename to data/fixtures/scopes/python/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/python/name.assignment.pattern.scope b/data/fixtures/scopes/python/name/name.assignment.pattern.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.assignment.pattern.scope
rename to data/fixtures/scopes/python/name/name.assignment.pattern.scope
diff --git a/data/fixtures/scopes/python/name.assignment.scope b/data/fixtures/scopes/python/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.assignment.scope
rename to data/fixtures/scopes/python/name/name.assignment.scope
diff --git a/data/fixtures/scopes/python/name.class.scope b/data/fixtures/scopes/python/name/name.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.class.scope
rename to data/fixtures/scopes/python/name/name.class.scope
diff --git a/data/fixtures/scopes/python/name.constructor.scope b/data/fixtures/scopes/python/name/name.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.constructor.scope
rename to data/fixtures/scopes/python/name/name.constructor.scope
diff --git a/data/fixtures/scopes/python/name.field.class.scope b/data/fixtures/scopes/python/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.field.class.scope
rename to data/fixtures/scopes/python/name/name.field.class.scope
diff --git a/data/fixtures/scopes/python/name.foreach.scope b/data/fixtures/scopes/python/name/name.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.foreach.scope
rename to data/fixtures/scopes/python/name/name.foreach.scope
diff --git a/data/fixtures/scopes/python/name.function.scope b/data/fixtures/scopes/python/name/name.function.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.function.scope
rename to data/fixtures/scopes/python/name/name.function.scope
diff --git a/data/fixtures/scopes/python/name.iteration.block.scope b/data/fixtures/scopes/python/name/name.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.iteration.block.scope
rename to data/fixtures/scopes/python/name/name.iteration.block.scope
diff --git a/data/fixtures/scopes/python/name.iteration.block2.scope b/data/fixtures/scopes/python/name/name.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.iteration.block2.scope
rename to data/fixtures/scopes/python/name/name.iteration.block2.scope
diff --git a/data/fixtures/scopes/python/name.iteration.block3.scope b/data/fixtures/scopes/python/name/name.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.iteration.block3.scope
rename to data/fixtures/scopes/python/name/name.iteration.block3.scope
diff --git a/data/fixtures/scopes/python/name.iteration.block4.scope b/data/fixtures/scopes/python/name/name.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.iteration.block4.scope
rename to data/fixtures/scopes/python/name/name.iteration.block4.scope
diff --git a/data/fixtures/scopes/python/name.iteration.class.scope b/data/fixtures/scopes/python/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.iteration.class.scope
rename to data/fixtures/scopes/python/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/python/name.iteration.document.scope b/data/fixtures/scopes/python/name/name.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.iteration.document.scope
rename to data/fixtures/scopes/python/name/name.iteration.document.scope
diff --git a/data/fixtures/scopes/python/name.method.scope b/data/fixtures/scopes/python/name/name.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.method.scope
rename to data/fixtures/scopes/python/name/name.method.scope
diff --git a/data/fixtures/scopes/python/name.resource.iteration.scope b/data/fixtures/scopes/python/name/name.resource.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.resource.iteration.scope
rename to data/fixtures/scopes/python/name/name.resource.iteration.scope
diff --git a/data/fixtures/scopes/python/name.resource.scope b/data/fixtures/scopes/python/name/name.resource.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.resource.scope
rename to data/fixtures/scopes/python/name/name.resource.scope
diff --git a/data/fixtures/scopes/python/name.resource2.scope b/data/fixtures/scopes/python/name/name.resource2.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.resource2.scope
rename to data/fixtures/scopes/python/name/name.resource2.scope
diff --git a/data/fixtures/scopes/python/name.resource3.scope b/data/fixtures/scopes/python/name/name.resource3.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.resource3.scope
rename to data/fixtures/scopes/python/name/name.resource3.scope
diff --git a/data/fixtures/scopes/python/name.variable.pattern.scope b/data/fixtures/scopes/python/name/name.variable.pattern.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.variable.pattern.scope
rename to data/fixtures/scopes/python/name/name.variable.pattern.scope
diff --git a/data/fixtures/scopes/python/name.variable.scope b/data/fixtures/scopes/python/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/python/name.variable.scope
rename to data/fixtures/scopes/python/name/name.variable.scope
diff --git a/data/fixtures/scopes/python/namedFunction.constructor.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/namedFunction.constructor.scope
rename to data/fixtures/scopes/python/namedFunction/namedFunction.constructor.scope
diff --git a/data/fixtures/scopes/python/namedFunction.iteration.document.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/python/namedFunction.iteration.document.scope
rename to data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope
diff --git a/data/fixtures/scopes/python/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/namedFunction.method.iteration.class.scope
rename to data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope
diff --git a/data/fixtures/scopes/python/namedFunction.method.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/namedFunction.method.scope
rename to data/fixtures/scopes/python/namedFunction/namedFunction.method.scope
diff --git a/data/fixtures/scopes/python/namedFunction.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.scope
similarity index 100%
rename from data/fixtures/scopes/python/namedFunction.scope
rename to data/fixtures/scopes/python/namedFunction/namedFunction.scope
diff --git a/data/fixtures/scopes/python/namedFunction2.scope b/data/fixtures/scopes/python/namedFunction/namedFunction2.scope
similarity index 100%
rename from data/fixtures/scopes/python/namedFunction2.scope
rename to data/fixtures/scopes/python/namedFunction/namedFunction2.scope
diff --git a/data/fixtures/scopes/python/statement.class.scope b/data/fixtures/scopes/python/statement/statement.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.class.scope
rename to data/fixtures/scopes/python/statement/statement.class.scope
diff --git a/data/fixtures/scopes/python/statement.field.class.scope b/data/fixtures/scopes/python/statement/statement.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.field.class.scope
rename to data/fixtures/scopes/python/statement/statement.field.class.scope
diff --git a/data/fixtures/scopes/python/statement.iteration.block.scope b/data/fixtures/scopes/python/statement/statement.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.iteration.block.scope
rename to data/fixtures/scopes/python/statement/statement.iteration.block.scope
diff --git a/data/fixtures/scopes/python/statement.iteration.block2.scope b/data/fixtures/scopes/python/statement/statement.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.iteration.block2.scope
rename to data/fixtures/scopes/python/statement/statement.iteration.block2.scope
diff --git a/data/fixtures/scopes/python/statement.iteration.block3.scope b/data/fixtures/scopes/python/statement/statement.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.iteration.block3.scope
rename to data/fixtures/scopes/python/statement/statement.iteration.block3.scope
diff --git a/data/fixtures/scopes/python/statement.iteration.block4.scope b/data/fixtures/scopes/python/statement/statement.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.iteration.block4.scope
rename to data/fixtures/scopes/python/statement/statement.iteration.block4.scope
diff --git a/data/fixtures/scopes/python/statement.iteration.class.scope b/data/fixtures/scopes/python/statement/statement.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.iteration.class.scope
rename to data/fixtures/scopes/python/statement/statement.iteration.class.scope
diff --git a/data/fixtures/scopes/python/statement.iteration.document.scope b/data/fixtures/scopes/python/statement/statement.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.iteration.document.scope
rename to data/fixtures/scopes/python/statement/statement.iteration.document.scope
diff --git a/data/fixtures/scopes/python/statement.scope b/data/fixtures/scopes/python/statement/statement.scope
similarity index 100%
rename from data/fixtures/scopes/python/statement.scope
rename to data/fixtures/scopes/python/statement/statement.scope
diff --git a/data/fixtures/scopes/python/type.argument.catch.scope b/data/fixtures/scopes/python/type/type.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.catch.scope
rename to data/fixtures/scopes/python/type/type.argument.catch.scope
diff --git a/data/fixtures/scopes/python/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/type/type.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/python/type/type.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/python/type.argument.formal.constructor.scope b/data/fixtures/scopes/python/type/type.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.formal.constructor.scope
rename to data/fixtures/scopes/python/type/type.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/python/type.argument.formal.iteration.scope b/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.formal.iteration.scope
rename to data/fixtures/scopes/python/type/type.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/python/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/python/type/type.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/python/type/type.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/python/type.argument.formal.method.scope b/data/fixtures/scopes/python/type/type.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.formal.method.scope
rename to data/fixtures/scopes/python/type/type.argument.formal.method.scope
diff --git a/data/fixtures/scopes/python/type.argument.formal.scope b/data/fixtures/scopes/python/type/type.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.argument.formal.scope
rename to data/fixtures/scopes/python/type/type.argument.formal.scope
diff --git a/data/fixtures/scopes/python/type.class.scope b/data/fixtures/scopes/python/type/type.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.class.scope
rename to data/fixtures/scopes/python/type/type.class.scope
diff --git a/data/fixtures/scopes/python/type.class2.scope b/data/fixtures/scopes/python/type/type.class2.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.class2.scope
rename to data/fixtures/scopes/python/type/type.class2.scope
diff --git a/data/fixtures/scopes/python/type.field.class.scope b/data/fixtures/scopes/python/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.field.class.scope
rename to data/fixtures/scopes/python/type/type.field.class.scope
diff --git a/data/fixtures/scopes/python/type.iteration.block.scope b/data/fixtures/scopes/python/type/type.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.iteration.block.scope
rename to data/fixtures/scopes/python/type/type.iteration.block.scope
diff --git a/data/fixtures/scopes/python/type.iteration.block2.scope b/data/fixtures/scopes/python/type/type.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.iteration.block2.scope
rename to data/fixtures/scopes/python/type/type.iteration.block2.scope
diff --git a/data/fixtures/scopes/python/type.iteration.block3.scope b/data/fixtures/scopes/python/type/type.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.iteration.block3.scope
rename to data/fixtures/scopes/python/type/type.iteration.block3.scope
diff --git a/data/fixtures/scopes/python/type.iteration.block4.scope b/data/fixtures/scopes/python/type/type.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.iteration.block4.scope
rename to data/fixtures/scopes/python/type/type.iteration.block4.scope
diff --git a/data/fixtures/scopes/python/type.iteration.class.scope b/data/fixtures/scopes/python/type/type.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.iteration.class.scope
rename to data/fixtures/scopes/python/type/type.iteration.class.scope
diff --git a/data/fixtures/scopes/python/type.iteration.document.scope b/data/fixtures/scopes/python/type/type.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.iteration.document.scope
rename to data/fixtures/scopes/python/type/type.iteration.document.scope
diff --git a/data/fixtures/scopes/python/type.return.scope b/data/fixtures/scopes/python/type/type.return.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.return.scope
rename to data/fixtures/scopes/python/type/type.return.scope
diff --git a/data/fixtures/scopes/python/type.typeArgument.iteration.scope b/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.typeArgument.iteration.scope
rename to data/fixtures/scopes/python/type/type.typeArgument.iteration.scope
diff --git a/data/fixtures/scopes/python/type.typeArgument.scope b/data/fixtures/scopes/python/type/type.typeArgument.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.typeArgument.scope
rename to data/fixtures/scopes/python/type/type.typeArgument.scope
diff --git a/data/fixtures/scopes/python/type.typeArgument2.scope b/data/fixtures/scopes/python/type/type.typeArgument2.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.typeArgument2.scope
rename to data/fixtures/scopes/python/type/type.typeArgument2.scope
diff --git a/data/fixtures/scopes/python/type.variable.scope b/data/fixtures/scopes/python/type/type.variable.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.variable.scope
rename to data/fixtures/scopes/python/type/type.variable.scope
diff --git a/data/fixtures/scopes/python/type.variable2.scope b/data/fixtures/scopes/python/type/type.variable2.scope
similarity index 100%
rename from data/fixtures/scopes/python/type.variable2.scope
rename to data/fixtures/scopes/python/type/type.variable2.scope
diff --git a/data/fixtures/scopes/python/value.argument.actual.iteration.scope b/data/fixtures/scopes/python/value/value.argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.actual.iteration.scope
rename to data/fixtures/scopes/python/value/value.argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/python/value.argument.actual.scope b/data/fixtures/scopes/python/value/value.argument.actual.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.actual.scope
rename to data/fixtures/scopes/python/value/value.argument.actual.scope
diff --git a/data/fixtures/scopes/python/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/value/value.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/python/value/value.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/python/value.argument.formal.constructor.scope b/data/fixtures/scopes/python/value/value.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.formal.constructor.scope
rename to data/fixtures/scopes/python/value/value.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/python/value.argument.formal.iteration.scope b/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.formal.iteration.scope
rename to data/fixtures/scopes/python/value/value.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/python/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/python/value/value.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/python/value/value.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/python/value.argument.formal.method.scope b/data/fixtures/scopes/python/value/value.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.formal.method.scope
rename to data/fixtures/scopes/python/value/value.argument.formal.method.scope
diff --git a/data/fixtures/scopes/python/value.argument.formal.scope b/data/fixtures/scopes/python/value/value.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.argument.formal.scope
rename to data/fixtures/scopes/python/value/value.argument.formal.scope
diff --git a/data/fixtures/scopes/python/value.assignment.scope b/data/fixtures/scopes/python/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.assignment.scope
rename to data/fixtures/scopes/python/value/value.assignment.scope
diff --git a/data/fixtures/scopes/python/value.field.class.scope b/data/fixtures/scopes/python/value/value.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.field.class.scope
rename to data/fixtures/scopes/python/value/value.field.class.scope
diff --git a/data/fixtures/scopes/python/value.foreach.scope b/data/fixtures/scopes/python/value/value.foreach.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.foreach.scope
rename to data/fixtures/scopes/python/value/value.foreach.scope
diff --git a/data/fixtures/scopes/python/value.iteration.block.scope b/data/fixtures/scopes/python/value/value.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.iteration.block.scope
rename to data/fixtures/scopes/python/value/value.iteration.block.scope
diff --git a/data/fixtures/scopes/python/value.iteration.block2.scope b/data/fixtures/scopes/python/value/value.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.iteration.block2.scope
rename to data/fixtures/scopes/python/value/value.iteration.block2.scope
diff --git a/data/fixtures/scopes/python/value.iteration.block3.scope b/data/fixtures/scopes/python/value/value.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.iteration.block3.scope
rename to data/fixtures/scopes/python/value/value.iteration.block3.scope
diff --git a/data/fixtures/scopes/python/value.iteration.block4.scope b/data/fixtures/scopes/python/value/value.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.iteration.block4.scope
rename to data/fixtures/scopes/python/value/value.iteration.block4.scope
diff --git a/data/fixtures/scopes/python/value.iteration.class.scope b/data/fixtures/scopes/python/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.iteration.class.scope
rename to data/fixtures/scopes/python/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/python/value.iteration.document.scope b/data/fixtures/scopes/python/value/value.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.iteration.document.scope
rename to data/fixtures/scopes/python/value/value.iteration.document.scope
diff --git a/data/fixtures/scopes/python/value.mapPair.iteration.scope b/data/fixtures/scopes/python/value/value.mapPair.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.mapPair.iteration.scope
rename to data/fixtures/scopes/python/value/value.mapPair.iteration.scope
diff --git a/data/fixtures/scopes/python/value.mapPair.scope b/data/fixtures/scopes/python/value/value.mapPair.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.mapPair.scope
rename to data/fixtures/scopes/python/value/value.mapPair.scope
diff --git a/data/fixtures/scopes/python/value.resource.iteration.scope b/data/fixtures/scopes/python/value/value.resource.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource.iteration.scope
rename to data/fixtures/scopes/python/value/value.resource.iteration.scope
diff --git a/data/fixtures/scopes/python/value.resource.iteration2.scope b/data/fixtures/scopes/python/value/value.resource.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource.iteration2.scope
rename to data/fixtures/scopes/python/value/value.resource.iteration2.scope
diff --git a/data/fixtures/scopes/python/value.resource.scope b/data/fixtures/scopes/python/value/value.resource.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource.scope
rename to data/fixtures/scopes/python/value/value.resource.scope
diff --git a/data/fixtures/scopes/python/value.resource2.scope b/data/fixtures/scopes/python/value/value.resource2.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource2.scope
rename to data/fixtures/scopes/python/value/value.resource2.scope
diff --git a/data/fixtures/scopes/python/value.resource3.scope b/data/fixtures/scopes/python/value/value.resource3.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource3.scope
rename to data/fixtures/scopes/python/value/value.resource3.scope
diff --git a/data/fixtures/scopes/python/value.resource4.scope b/data/fixtures/scopes/python/value/value.resource4.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource4.scope
rename to data/fixtures/scopes/python/value/value.resource4.scope
diff --git a/data/fixtures/scopes/python/value.resource5.scope b/data/fixtures/scopes/python/value/value.resource5.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.resource5.scope
rename to data/fixtures/scopes/python/value/value.resource5.scope
diff --git a/data/fixtures/scopes/python/value.return.lambda.scope b/data/fixtures/scopes/python/value/value.return.lambda.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.return.lambda.scope
rename to data/fixtures/scopes/python/value/value.return.lambda.scope
diff --git a/data/fixtures/scopes/python/value.return.scope b/data/fixtures/scopes/python/value/value.return.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.return.scope
rename to data/fixtures/scopes/python/value/value.return.scope
diff --git a/data/fixtures/scopes/python/value.variable.pattern.scope b/data/fixtures/scopes/python/value/value.variable.pattern.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.variable.pattern.scope
rename to data/fixtures/scopes/python/value/value.variable.pattern.scope
diff --git a/data/fixtures/scopes/python/value.variable.scope b/data/fixtures/scopes/python/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.variable.scope
rename to data/fixtures/scopes/python/value/value.variable.scope
diff --git a/data/fixtures/scopes/python/value.yield.scope b/data/fixtures/scopes/python/value/value.yield.scope
similarity index 100%
rename from data/fixtures/scopes/python/value.yield.scope
rename to data/fixtures/scopes/python/value/value.yield.scope
diff --git a/data/fixtures/scopes/r/argument.actual.iteration.scope b/data/fixtures/scopes/r/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.actual.iteration.scope
rename to data/fixtures/scopes/r/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/r/argument.actual.multiLine.scope b/data/fixtures/scopes/r/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.actual.multiLine.scope
rename to data/fixtures/scopes/r/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/r/argument.actual.singleLine.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.actual.singleLine.scope
rename to data/fixtures/scopes/r/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/r/argument.actual.singleLine2.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.actual.singleLine2.scope
rename to data/fixtures/scopes/r/argument/argument.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/r/argument.actual.singleLine3.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine3.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.actual.singleLine3.scope
rename to data/fixtures/scopes/r/argument/argument.actual.singleLine3.scope
diff --git a/data/fixtures/scopes/r/argument.actual.singleLine4.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine4.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.actual.singleLine4.scope
rename to data/fixtures/scopes/r/argument/argument.actual.singleLine4.scope
diff --git a/data/fixtures/scopes/r/argument.formal.iteration.scope b/data/fixtures/scopes/r/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.formal.iteration.scope
rename to data/fixtures/scopes/r/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/r/argument.formal.multiLine.scope b/data/fixtures/scopes/r/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.formal.multiLine.scope
rename to data/fixtures/scopes/r/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/r/argument.formal.singleLine.scope b/data/fixtures/scopes/r/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/r/argument.formal.singleLine.scope
rename to data/fixtures/scopes/r/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/ruby/argument.actual.iteration.scope b/data/fixtures/scopes/ruby/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.actual.iteration.scope
rename to data/fixtures/scopes/ruby/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/ruby/argument.actual.iteration2.scope b/data/fixtures/scopes/ruby/argument/argument.actual.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.actual.iteration2.scope
rename to data/fixtures/scopes/ruby/argument/argument.actual.iteration2.scope
diff --git a/data/fixtures/scopes/ruby/argument.actual.multiLine.scope b/data/fixtures/scopes/ruby/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.actual.multiLine.scope
rename to data/fixtures/scopes/ruby/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope b/data/fixtures/scopes/ruby/argument/argument.actual.multiLine2.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.actual.multiLine2.scope
rename to data/fixtures/scopes/ruby/argument/argument.actual.multiLine2.scope
diff --git a/data/fixtures/scopes/ruby/argument.actual.singleLine.scope b/data/fixtures/scopes/ruby/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.actual.singleLine.scope
rename to data/fixtures/scopes/ruby/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/ruby/argument.actual.singleLine2.scope b/data/fixtures/scopes/ruby/argument/argument.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.actual.singleLine2.scope
rename to data/fixtures/scopes/ruby/argument/argument.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/ruby/argument.formal.iteration.scope b/data/fixtures/scopes/ruby/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.formal.iteration.scope
rename to data/fixtures/scopes/ruby/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/ruby/argument.formal.multiLine.scope b/data/fixtures/scopes/ruby/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.formal.multiLine.scope
rename to data/fixtures/scopes/ruby/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/ruby/argument.formal.singleLine.scope b/data/fixtures/scopes/ruby/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argument.formal.singleLine.scope
rename to data/fixtures/scopes/ruby/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.actual.empty.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.actual.empty.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.actual.empty.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.actual.empty.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.actual.multiLine.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.actual.multiLine.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.actual.multiLine.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.actual.singleLine.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.actual.singleLine.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.actual.singleLine.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.formal.empty.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.formal.empty.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.formal.empty.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.formal.empty.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.formal.empty2.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.formal.empty2.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.formal.empty2.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.formal.empty2.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.formal.multiLine.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.formal.multiLine.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.formal.multiLine.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.formal.multiLine2.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.formal.multiLine2.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.formal.multiLine2.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.formal.multiLine2.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.formal.singleLine.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.formal.singleLine.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.formal.singleLine.scope
diff --git a/data/fixtures/scopes/ruby/argumentList.formal.singleLine2.scope b/data/fixtures/scopes/ruby/argumentList/argumentList.formal.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/ruby/argumentList.formal.singleLine2.scope
rename to data/fixtures/scopes/ruby/argumentList/argumentList.formal.singleLine2.scope
diff --git a/data/fixtures/scopes/scala/argument.actual.iteration.scope b/data/fixtures/scopes/scala/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.actual.iteration.scope
rename to data/fixtures/scopes/scala/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/scala/argument.actual.multiLine.scope b/data/fixtures/scopes/scala/argument/argument.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.actual.multiLine.scope
rename to data/fixtures/scopes/scala/argument/argument.actual.multiLine.scope
diff --git a/data/fixtures/scopes/scala/argument.actual.singleLine.scope b/data/fixtures/scopes/scala/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.actual.singleLine.scope
rename to data/fixtures/scopes/scala/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/scala/argument.formal.iteration.scope b/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.formal.iteration.scope
rename to data/fixtures/scopes/scala/argument/argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/scala/argument.formal.iteration2.scope b/data/fixtures/scopes/scala/argument/argument.formal.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.formal.iteration2.scope
rename to data/fixtures/scopes/scala/argument/argument.formal.iteration2.scope
diff --git a/data/fixtures/scopes/scala/argument.formal.multiLine.scope b/data/fixtures/scopes/scala/argument/argument.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.formal.multiLine.scope
rename to data/fixtures/scopes/scala/argument/argument.formal.multiLine.scope
diff --git a/data/fixtures/scopes/scala/argument.formal.multiLine2.scope b/data/fixtures/scopes/scala/argument/argument.formal.multiLine2.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.formal.multiLine2.scope
rename to data/fixtures/scopes/scala/argument/argument.formal.multiLine2.scope
diff --git a/data/fixtures/scopes/scala/argument.formal.singleLine.scope b/data/fixtures/scopes/scala/argument/argument.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.formal.singleLine.scope
rename to data/fixtures/scopes/scala/argument/argument.formal.singleLine.scope
diff --git a/data/fixtures/scopes/scala/argument.formal.singleLine2.scope b/data/fixtures/scopes/scala/argument/argument.formal.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argument.formal.singleLine2.scope
rename to data/fixtures/scopes/scala/argument/argument.formal.singleLine2.scope
diff --git a/data/fixtures/scopes/scala/argumentList.actual.empty.scope b/data/fixtures/scopes/scala/argumentList/argumentList.actual.empty.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.actual.empty.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.actual.empty.scope
diff --git a/data/fixtures/scopes/scala/argumentList.actual.multiLine.scope b/data/fixtures/scopes/scala/argumentList/argumentList.actual.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.actual.multiLine.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.actual.multiLine.scope
diff --git a/data/fixtures/scopes/scala/argumentList.actual.singleLine.scope b/data/fixtures/scopes/scala/argumentList/argumentList.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.actual.singleLine.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.actual.singleLine.scope
diff --git a/data/fixtures/scopes/scala/argumentList.formal.empty.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.empty.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.formal.empty.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.formal.empty.scope
diff --git a/data/fixtures/scopes/scala/argumentList.formal.empty2.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.empty2.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.formal.empty2.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.formal.empty2.scope
diff --git a/data/fixtures/scopes/scala/argumentList.formal.multiLine.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.formal.multiLine.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine.scope
diff --git a/data/fixtures/scopes/scala/argumentList.formal.multiLine2.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine2.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.formal.multiLine2.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine2.scope
diff --git a/data/fixtures/scopes/scala/argumentList.formal.singleLine.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.formal.singleLine.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine.scope
diff --git a/data/fixtures/scopes/scala/argumentList.formal.singleLine2.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/scala/argumentList.formal.singleLine2.scope
rename to data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine2.scope
diff --git a/data/fixtures/scopes/talon/argument.actual.iteration.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argument.actual.iteration.scope
rename to data/fixtures/scopes/talon/argument/argument.actual.iteration.scope
diff --git a/data/fixtures/scopes/talon/argument.actual.iteration2.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argument.actual.iteration2.scope
rename to data/fixtures/scopes/talon/argument/argument.actual.iteration2.scope
diff --git a/data/fixtures/scopes/talon/argument.actual.iteration3.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argument.actual.iteration3.scope
rename to data/fixtures/scopes/talon/argument/argument.actual.iteration3.scope
diff --git a/data/fixtures/scopes/talon/argument.actual.singleLine.scope b/data/fixtures/scopes/talon/argument/argument.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argument.actual.singleLine.scope
rename to data/fixtures/scopes/talon/argument/argument.actual.singleLine.scope
diff --git a/data/fixtures/scopes/talon/argument.actual.singleLine2.scope b/data/fixtures/scopes/talon/argument/argument.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argument.actual.singleLine2.scope
rename to data/fixtures/scopes/talon/argument/argument.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/talon/argument.actual.singleLine3.scope b/data/fixtures/scopes/talon/argument/argument.actual.singleLine3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argument.actual.singleLine3.scope
rename to data/fixtures/scopes/talon/argument/argument.actual.singleLine3.scope
diff --git a/data/fixtures/scopes/talon/argumentList.actual.empty.scope b/data/fixtures/scopes/talon/argumentList/argumentList.actual.empty.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argumentList.actual.empty.scope
rename to data/fixtures/scopes/talon/argumentList/argumentList.actual.empty.scope
diff --git a/data/fixtures/scopes/talon/argumentList.actual.method.empty.scope b/data/fixtures/scopes/talon/argumentList/argumentList.actual.method.empty.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argumentList.actual.method.empty.scope
rename to data/fixtures/scopes/talon/argumentList/argumentList.actual.method.empty.scope
diff --git a/data/fixtures/scopes/talon/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/talon/argumentList/argumentList.actual.method.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argumentList.actual.method.singleLine.scope
rename to data/fixtures/scopes/talon/argumentList/argumentList.actual.method.singleLine.scope
diff --git a/data/fixtures/scopes/talon/argumentList.actual.singleLine.scope b/data/fixtures/scopes/talon/argumentList/argumentList.actual.singleLine.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argumentList.actual.singleLine.scope
rename to data/fixtures/scopes/talon/argumentList/argumentList.actual.singleLine.scope
diff --git a/data/fixtures/scopes/talon/argumentList.actual.singleLine2.scope b/data/fixtures/scopes/talon/argumentList/argumentList.actual.singleLine2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argumentList.actual.singleLine2.scope
rename to data/fixtures/scopes/talon/argumentList/argumentList.actual.singleLine2.scope
diff --git a/data/fixtures/scopes/talon/argumentList.actual.singleLine3.scope b/data/fixtures/scopes/talon/argumentList/argumentList.actual.singleLine3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/argumentList.actual.singleLine3.scope
rename to data/fixtures/scopes/talon/argumentList/argumentList.actual.singleLine3.scope
diff --git a/data/fixtures/scopes/talon/key.mapPair.iteration.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/talon/key.mapPair.iteration.scope
rename to data/fixtures/scopes/talon/key/key.mapPair.iteration.scope
diff --git a/data/fixtures/scopes/talon/key.mapPair.iteration2.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/key.mapPair.iteration2.scope
rename to data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope
diff --git a/data/fixtures/scopes/talon/key.mapPair.iteration3.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/key.mapPair.iteration3.scope
rename to data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope
diff --git a/data/fixtures/scopes/talon/key.mapPair.scope b/data/fixtures/scopes/talon/key/key.mapPair.scope
similarity index 100%
rename from data/fixtures/scopes/talon/key.mapPair.scope
rename to data/fixtures/scopes/talon/key/key.mapPair.scope
diff --git a/data/fixtures/scopes/talon/key.mapPair2.scope b/data/fixtures/scopes/talon/key/key.mapPair2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/key.mapPair2.scope
rename to data/fixtures/scopes/talon/key/key.mapPair2.scope
diff --git a/data/fixtures/scopes/talon/key.mapPair3.scope b/data/fixtures/scopes/talon/key/key.mapPair3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/key.mapPair3.scope
rename to data/fixtures/scopes/talon/key/key.mapPair3.scope
diff --git a/data/fixtures/scopes/talon/name.assignment.scope b/data/fixtures/scopes/talon/name/name.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.assignment.scope
rename to data/fixtures/scopes/talon/name/name.assignment.scope
diff --git a/data/fixtures/scopes/talon/name.command.scope b/data/fixtures/scopes/talon/name/name.command.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.command.scope
rename to data/fixtures/scopes/talon/name/name.command.scope
diff --git a/data/fixtures/scopes/talon/name.command2.scope b/data/fixtures/scopes/talon/name/name.command2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.command2.scope
rename to data/fixtures/scopes/talon/name/name.command2.scope
diff --git a/data/fixtures/scopes/talon/name.command3.scope b/data/fixtures/scopes/talon/name/name.command3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.command3.scope
rename to data/fixtures/scopes/talon/name/name.command3.scope
diff --git a/data/fixtures/scopes/talon/name.iteration.block.scope b/data/fixtures/scopes/talon/name/name.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.iteration.block.scope
rename to data/fixtures/scopes/talon/name/name.iteration.block.scope
diff --git a/data/fixtures/scopes/talon/name.iteration.block2.scope b/data/fixtures/scopes/talon/name/name.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.iteration.block2.scope
rename to data/fixtures/scopes/talon/name/name.iteration.block2.scope
diff --git a/data/fixtures/scopes/talon/name.iteration.block3.scope b/data/fixtures/scopes/talon/name/name.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.iteration.block3.scope
rename to data/fixtures/scopes/talon/name/name.iteration.block3.scope
diff --git a/data/fixtures/scopes/talon/name.iteration.document.scope b/data/fixtures/scopes/talon/name/name.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.iteration.document.scope
rename to data/fixtures/scopes/talon/name/name.iteration.document.scope
diff --git a/data/fixtures/scopes/talon/name.variable.scope b/data/fixtures/scopes/talon/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/talon/name.variable.scope
rename to data/fixtures/scopes/talon/name/name.variable.scope
diff --git a/data/fixtures/scopes/talon/value.assignment.scope b/data/fixtures/scopes/talon/value/value.assignment.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.assignment.scope
rename to data/fixtures/scopes/talon/value/value.assignment.scope
diff --git a/data/fixtures/scopes/talon/value.command.scope b/data/fixtures/scopes/talon/value/value.command.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.command.scope
rename to data/fixtures/scopes/talon/value/value.command.scope
diff --git a/data/fixtures/scopes/talon/value.iteration.block.scope b/data/fixtures/scopes/talon/value/value.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.iteration.block.scope
rename to data/fixtures/scopes/talon/value/value.iteration.block.scope
diff --git a/data/fixtures/scopes/talon/value.iteration.block2.scope b/data/fixtures/scopes/talon/value/value.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.iteration.block2.scope
rename to data/fixtures/scopes/talon/value/value.iteration.block2.scope
diff --git a/data/fixtures/scopes/talon/value.iteration.block3.scope b/data/fixtures/scopes/talon/value/value.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.iteration.block3.scope
rename to data/fixtures/scopes/talon/value/value.iteration.block3.scope
diff --git a/data/fixtures/scopes/talon/value.iteration.document.scope b/data/fixtures/scopes/talon/value/value.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.iteration.document.scope
rename to data/fixtures/scopes/talon/value/value.iteration.document.scope
diff --git a/data/fixtures/scopes/talon/value.mapPair.iteration.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.mapPair.iteration.scope
rename to data/fixtures/scopes/talon/value/value.mapPair.iteration.scope
diff --git a/data/fixtures/scopes/talon/value.mapPair.iteration2.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.mapPair.iteration2.scope
rename to data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope
diff --git a/data/fixtures/scopes/talon/value.mapPair.iteration3.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.mapPair.iteration3.scope
rename to data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope
diff --git a/data/fixtures/scopes/talon/value.mapPair.scope b/data/fixtures/scopes/talon/value/value.mapPair.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.mapPair.scope
rename to data/fixtures/scopes/talon/value/value.mapPair.scope
diff --git a/data/fixtures/scopes/talon/value.mapPair2.scope b/data/fixtures/scopes/talon/value/value.mapPair2.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.mapPair2.scope
rename to data/fixtures/scopes/talon/value/value.mapPair2.scope
diff --git a/data/fixtures/scopes/talon/value.variable.scope b/data/fixtures/scopes/talon/value/value.variable.scope
similarity index 100%
rename from data/fixtures/scopes/talon/value.variable.scope
rename to data/fixtures/scopes/talon/value/value.variable.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph.iteration.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph.iteration.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.iteration.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph2.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph2.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph2.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph2.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph3.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph3.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph3.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph3.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph4.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph4.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph4.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph4.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph5.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph5.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph5.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph5.scope
diff --git a/data/fixtures/scopes/textual/boundedParagraph6.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph6.scope
similarity index 100%
rename from data/fixtures/scopes/textual/boundedParagraph6.scope
rename to data/fixtures/scopes/textual/boundedParagraph/boundedParagraph6.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration2.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration2.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration2.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration3.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration3.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration3.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration3.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration4.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration4.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration4.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration4.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration5.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration5.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration5.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration5.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration6.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration6.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration6.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration6.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.iteration7.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration7.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.iteration7.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration7.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual10.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual10.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual10.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual10.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual11.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual11.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual11.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual11.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual12.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual12.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual12.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual12.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual13.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual13.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual13.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual13.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual14.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual14.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual14.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual14.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual15.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual15.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual15.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual15.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual2.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual2.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual2.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual2.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual3.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual3.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual3.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual3.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual4.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual4.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual4.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual4.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual5.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual5.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual5.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual5.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual6.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual6.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual6.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual6.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual7.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual7.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual7.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual7.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual8.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual8.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual8.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual8.scope
diff --git a/data/fixtures/scopes/textual/collectionItem.textual9.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual9.scope
similarity index 100%
rename from data/fixtures/scopes/textual/collectionItem.textual9.scope
rename to data/fixtures/scopes/textual/collectionItem/collectionItem.textual9.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair.iteration.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair.iteration.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair.iteration2.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration2.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair.iteration2.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration2.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair2.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair2.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair2.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair2.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair3.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair3.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair3.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair3.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair4.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair4.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair4.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair4.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair5.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair5.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair5.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair5.scope
diff --git a/data/fixtures/scopes/textual/surroundingPair6.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair6.scope
similarity index 100%
rename from data/fixtures/scopes/textual/surroundingPair6.scope
rename to data/fixtures/scopes/textual/surroundingPair/surroundingPair6.scope
diff --git a/data/fixtures/scopes/typescript.core/name.argument.formal.scope b/data/fixtures/scopes/typescript.core/name/name.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.argument.formal.scope
rename to data/fixtures/scopes/typescript.core/name/name.argument.formal.scope
diff --git a/data/fixtures/scopes/typescript.core/name.field.class.scope b/data/fixtures/scopes/typescript.core/name/name.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.field.class.scope
rename to data/fixtures/scopes/typescript.core/name/name.field.class.scope
diff --git a/data/fixtures/scopes/typescript.core/name.field.interface.scope b/data/fixtures/scopes/typescript.core/name/name.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.field.interface.scope
rename to data/fixtures/scopes/typescript.core/name/name.field.interface.scope
diff --git a/data/fixtures/scopes/typescript.core/name.interface.scope b/data/fixtures/scopes/typescript.core/name/name.interface.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.interface.scope
rename to data/fixtures/scopes/typescript.core/name/name.interface.scope
diff --git a/data/fixtures/scopes/typescript.core/name.iteration.class.scope b/data/fixtures/scopes/typescript.core/name/name.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.iteration.class.scope
rename to data/fixtures/scopes/typescript.core/name/name.iteration.class.scope
diff --git a/data/fixtures/scopes/typescript.core/name.iteration.interface.scope b/data/fixtures/scopes/typescript.core/name/name.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.iteration.interface.scope
rename to data/fixtures/scopes/typescript.core/name/name.iteration.interface.scope
diff --git a/data/fixtures/scopes/typescript.core/name.variable.scope b/data/fixtures/scopes/typescript.core/name/name.variable.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/name.variable.scope
rename to data/fixtures/scopes/typescript.core/name/name.variable.scope
diff --git a/data/fixtures/scopes/typescript.core/type.alias.scope b/data/fixtures/scopes/typescript.core/type/type.alias.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.alias.scope
rename to data/fixtures/scopes/typescript.core/type/type.alias.scope
diff --git a/data/fixtures/scopes/typescript.core/type.alias2.scope b/data/fixtures/scopes/typescript.core/type/type.alias2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.alias2.scope
rename to data/fixtures/scopes/typescript.core/type/type.alias2.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.catch.scope b/data/fixtures/scopes/typescript.core/type/type.argument.catch.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.catch.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.catch.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal.constructor.iteration.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.constructor.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal.constructor.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal.iteration.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal.iteration.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal.method.iteration.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.method.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal.method.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal2.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal2.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal2.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal3.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal3.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal3.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal3.scope
diff --git a/data/fixtures/scopes/typescript.core/type.argument.formal4.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal4.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.argument.formal4.scope
rename to data/fixtures/scopes/typescript.core/type/type.argument.formal4.scope
diff --git a/data/fixtures/scopes/typescript.core/type.cast.scope b/data/fixtures/scopes/typescript.core/type/type.cast.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.cast.scope
rename to data/fixtures/scopes/typescript.core/type/type.cast.scope
diff --git a/data/fixtures/scopes/typescript.core/type.cast2.scope b/data/fixtures/scopes/typescript.core/type/type.cast2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.cast2.scope
rename to data/fixtures/scopes/typescript.core/type/type.cast2.scope
diff --git a/data/fixtures/scopes/typescript.core/type.class.scope b/data/fixtures/scopes/typescript.core/type/type.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.class.scope
rename to data/fixtures/scopes/typescript.core/type/type.class.scope
diff --git a/data/fixtures/scopes/typescript.core/type.enum.scope b/data/fixtures/scopes/typescript.core/type/type.enum.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.enum.scope
rename to data/fixtures/scopes/typescript.core/type/type.enum.scope
diff --git a/data/fixtures/scopes/typescript.core/type.enum2.scope b/data/fixtures/scopes/typescript.core/type/type.enum2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.enum2.scope
rename to data/fixtures/scopes/typescript.core/type/type.enum2.scope
diff --git a/data/fixtures/scopes/typescript.core/type.field.class.scope b/data/fixtures/scopes/typescript.core/type/type.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.field.class.scope
rename to data/fixtures/scopes/typescript.core/type/type.field.class.scope
diff --git a/data/fixtures/scopes/typescript.core/type.field.interface.scope b/data/fixtures/scopes/typescript.core/type/type.field.interface.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.field.interface.scope
rename to data/fixtures/scopes/typescript.core/type/type.field.interface.scope
diff --git a/data/fixtures/scopes/typescript.core/type.interface.scope b/data/fixtures/scopes/typescript.core/type/type.interface.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.interface.scope
rename to data/fixtures/scopes/typescript.core/type/type.interface.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.block.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.block.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.block.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.block2.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.block2.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.block2.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.block3.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block3.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.block3.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.block3.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.block4.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block4.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.block4.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.block4.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.class.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.class.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.class.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.document.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.document.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.document.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.document.scope
diff --git a/data/fixtures/scopes/typescript.core/type.iteration.interface.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.interface.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.iteration.interface.scope
rename to data/fixtures/scopes/typescript.core/type/type.iteration.interface.scope
diff --git a/data/fixtures/scopes/typescript.core/type.return.scope b/data/fixtures/scopes/typescript.core/type/type.return.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.return.scope
rename to data/fixtures/scopes/typescript.core/type/type.return.scope
diff --git a/data/fixtures/scopes/typescript.core/type.typeArgument.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.typeArgument.iteration.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.typeArgument.iteration.scope
rename to data/fixtures/scopes/typescript.core/type/type.typeArgument.iteration.scope
diff --git a/data/fixtures/scopes/typescript.core/type.typeArgument.scope b/data/fixtures/scopes/typescript.core/type/type.typeArgument.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.typeArgument.scope
rename to data/fixtures/scopes/typescript.core/type/type.typeArgument.scope
diff --git a/data/fixtures/scopes/typescript.core/type.typeArgument2.scope b/data/fixtures/scopes/typescript.core/type/type.typeArgument2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.typeArgument2.scope
rename to data/fixtures/scopes/typescript.core/type/type.typeArgument2.scope
diff --git a/data/fixtures/scopes/typescript.core/type.variable.scope b/data/fixtures/scopes/typescript.core/type/type.variable.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/type.variable.scope
rename to data/fixtures/scopes/typescript.core/type/type.variable.scope
diff --git a/data/fixtures/scopes/typescript.core/value.argument.formal.scope b/data/fixtures/scopes/typescript.core/value/value.argument.formal.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/value.argument.formal.scope
rename to data/fixtures/scopes/typescript.core/value/value.argument.formal.scope
diff --git a/data/fixtures/scopes/typescript.core/value.argument.formal2.scope b/data/fixtures/scopes/typescript.core/value/value.argument.formal2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/value.argument.formal2.scope
rename to data/fixtures/scopes/typescript.core/value/value.argument.formal2.scope
diff --git a/data/fixtures/scopes/typescript.core/value.field.class.scope b/data/fixtures/scopes/typescript.core/value/value.field.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/value.field.class.scope
rename to data/fixtures/scopes/typescript.core/value/value.field.class.scope
diff --git a/data/fixtures/scopes/typescript.core/value.iteration.class.scope b/data/fixtures/scopes/typescript.core/value/value.iteration.class.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/value.iteration.class.scope
rename to data/fixtures/scopes/typescript.core/value/value.iteration.class.scope
diff --git a/data/fixtures/scopes/typescript.core/value.typeAlias.scope b/data/fixtures/scopes/typescript.core/value/value.typeAlias.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/value.typeAlias.scope
rename to data/fixtures/scopes/typescript.core/value/value.typeAlias.scope
diff --git a/data/fixtures/scopes/typescript.core/value.typeAlias2.scope b/data/fixtures/scopes/typescript.core/value/value.typeAlias2.scope
similarity index 100%
rename from data/fixtures/scopes/typescript.core/value.typeAlias2.scope
rename to data/fixtures/scopes/typescript.core/value/value.typeAlias2.scope