diff --git a/tests/cases/fourslash_old/alignmentAfterFormattingOnMultilineExpressionAndParametersList.ts b/tests/cases/fourslash/alignmentAfterFormattingOnMultilineExpressionAndParametersList.ts similarity index 100% rename from tests/cases/fourslash_old/alignmentAfterFormattingOnMultilineExpressionAndParametersList.ts rename to tests/cases/fourslash/alignmentAfterFormattingOnMultilineExpressionAndParametersList.ts diff --git a/tests/cases/fourslash_old/autoFormattingOnPasting.ts b/tests/cases/fourslash/autoFormattingOnPasting.ts similarity index 100% rename from tests/cases/fourslash_old/autoFormattingOnPasting.ts rename to tests/cases/fourslash/autoFormattingOnPasting.ts diff --git a/tests/cases/fourslash_old/chainedFatArrowFormatting.ts b/tests/cases/fourslash/chainedFatArrowFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/chainedFatArrowFormatting.ts rename to tests/cases/fourslash/chainedFatArrowFormatting.ts diff --git a/tests/cases/fourslash_old/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts b/tests/cases/fourslash/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts rename to tests/cases/fourslash/consistenceOnIndentionsOfObjectsInAListAfterFormatting.ts diff --git a/tests/cases/fourslash_old/constructorBraceFormatting.ts b/tests/cases/fourslash/constructorBraceFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/constructorBraceFormatting.ts rename to tests/cases/fourslash/constructorBraceFormatting.ts diff --git a/tests/cases/fourslash_old/formatAfterObjectLiteral.ts b/tests/cases/fourslash/formatAfterObjectLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/formatAfterObjectLiteral.ts rename to tests/cases/fourslash/formatAfterObjectLiteral.ts diff --git a/tests/cases/fourslash_old/formatAnyTypeLiteral.ts b/tests/cases/fourslash/formatAnyTypeLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/formatAnyTypeLiteral.ts rename to tests/cases/fourslash/formatAnyTypeLiteral.ts diff --git a/tests/cases/fourslash_old/formatArrayOrObjectLiteralsInVariableList.ts b/tests/cases/fourslash/formatArrayOrObjectLiteralsInVariableList.ts similarity index 100% rename from tests/cases/fourslash_old/formatArrayOrObjectLiteralsInVariableList.ts rename to tests/cases/fourslash/formatArrayOrObjectLiteralsInVariableList.ts diff --git a/tests/cases/fourslash_old/formatColonAndQMark.ts b/tests/cases/fourslash/formatColonAndQMark.ts similarity index 100% rename from tests/cases/fourslash_old/formatColonAndQMark.ts rename to tests/cases/fourslash/formatColonAndQMark.ts diff --git a/tests/cases/fourslash_old/formatControlFlowConstructs.ts b/tests/cases/fourslash/formatControlFlowConstructs.ts similarity index 100% rename from tests/cases/fourslash_old/formatControlFlowConstructs.ts rename to tests/cases/fourslash/formatControlFlowConstructs.ts diff --git a/tests/cases/fourslash_old/formatDebuggerStatement.ts b/tests/cases/fourslash/formatDebuggerStatement.ts similarity index 100% rename from tests/cases/fourslash_old/formatDebuggerStatement.ts rename to tests/cases/fourslash/formatDebuggerStatement.ts diff --git a/tests/cases/fourslash_old/formatEmptyBlock.ts b/tests/cases/fourslash/formatEmptyBlock.ts similarity index 100% rename from tests/cases/fourslash_old/formatEmptyBlock.ts rename to tests/cases/fourslash/formatEmptyBlock.ts diff --git a/tests/cases/fourslash_old/formatImplicitModule.ts b/tests/cases/fourslash/formatImplicitModule.ts similarity index 100% rename from tests/cases/fourslash_old/formatImplicitModule.ts rename to tests/cases/fourslash/formatImplicitModule.ts diff --git a/tests/cases/fourslash_old/formatImportDeclaration.ts b/tests/cases/fourslash/formatImportDeclaration.ts similarity index 100% rename from tests/cases/fourslash_old/formatImportDeclaration.ts rename to tests/cases/fourslash/formatImportDeclaration.ts diff --git a/tests/cases/fourslash_old/formatMultilineComment.ts b/tests/cases/fourslash/formatMultilineComment.ts similarity index 100% rename from tests/cases/fourslash_old/formatMultilineComment.ts rename to tests/cases/fourslash/formatMultilineComment.ts diff --git a/tests/cases/fourslash_old/formatOnSemiColonAfterBreak.ts b/tests/cases/fourslash/formatOnSemiColonAfterBreak.ts similarity index 100% rename from tests/cases/fourslash_old/formatOnSemiColonAfterBreak.ts rename to tests/cases/fourslash/formatOnSemiColonAfterBreak.ts diff --git a/tests/cases/fourslash_old/formatSelectionWithTrivia.ts b/tests/cases/fourslash/formatSelectionWithTrivia.ts similarity index 100% rename from tests/cases/fourslash_old/formatSelectionWithTrivia.ts rename to tests/cases/fourslash/formatSelectionWithTrivia.ts diff --git a/tests/cases/fourslash_old/formatTryCatch.ts b/tests/cases/fourslash/formatTryCatch.ts similarity index 100% rename from tests/cases/fourslash_old/formatTryCatch.ts rename to tests/cases/fourslash/formatTryCatch.ts diff --git a/tests/cases/fourslash_old/formatVariableDeclarationList.ts b/tests/cases/fourslash/formatVariableDeclarationList.ts similarity index 100% rename from tests/cases/fourslash_old/formatVariableDeclarationList.ts rename to tests/cases/fourslash/formatVariableDeclarationList.ts diff --git a/tests/cases/fourslash_old/formatWithStatement.ts b/tests/cases/fourslash/formatWithStatement.ts similarity index 100% rename from tests/cases/fourslash_old/formatWithStatement.ts rename to tests/cases/fourslash/formatWithStatement.ts diff --git a/tests/cases/fourslash_old/formattingAfterChainedFatArrow.ts b/tests/cases/fourslash/formattingAfterChainedFatArrow.ts similarity index 100% rename from tests/cases/fourslash_old/formattingAfterChainedFatArrow.ts rename to tests/cases/fourslash/formattingAfterChainedFatArrow.ts diff --git a/tests/cases/fourslash_old/formattingAfterMultiLineIfCondition.ts b/tests/cases/fourslash/formattingAfterMultiLineIfCondition.ts similarity index 100% rename from tests/cases/fourslash_old/formattingAfterMultiLineIfCondition.ts rename to tests/cases/fourslash/formattingAfterMultiLineIfCondition.ts diff --git a/tests/cases/fourslash_old/formattingAfterMultiLineString.ts b/tests/cases/fourslash/formattingAfterMultiLineString.ts similarity index 100% rename from tests/cases/fourslash_old/formattingAfterMultiLineString.ts rename to tests/cases/fourslash/formattingAfterMultiLineString.ts diff --git a/tests/cases/fourslash_old/formattingArrayLiteral.ts b/tests/cases/fourslash/formattingArrayLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/formattingArrayLiteral.ts rename to tests/cases/fourslash/formattingArrayLiteral.ts diff --git a/tests/cases/fourslash_old/formattingComma.ts b/tests/cases/fourslash/formattingComma.ts similarity index 100% rename from tests/cases/fourslash_old/formattingComma.ts rename to tests/cases/fourslash/formattingComma.ts diff --git a/tests/cases/fourslash_old/formattingCrash.ts b/tests/cases/fourslash/formattingCrash.ts similarity index 100% rename from tests/cases/fourslash_old/formattingCrash.ts rename to tests/cases/fourslash/formattingCrash.ts diff --git a/tests/cases/fourslash_old/formattingElseInsideAFunction.ts b/tests/cases/fourslash/formattingElseInsideAFunction.ts similarity index 100% rename from tests/cases/fourslash_old/formattingElseInsideAFunction.ts rename to tests/cases/fourslash/formattingElseInsideAFunction.ts diff --git a/tests/cases/fourslash_old/formattingFatArrowFunctions.ts b/tests/cases/fourslash/formattingFatArrowFunctions.ts similarity index 100% rename from tests/cases/fourslash_old/formattingFatArrowFunctions.ts rename to tests/cases/fourslash/formattingFatArrowFunctions.ts diff --git a/tests/cases/fourslash_old/formattingForIn.ts b/tests/cases/fourslash/formattingForIn.ts similarity index 100% rename from tests/cases/fourslash_old/formattingForIn.ts rename to tests/cases/fourslash/formattingForIn.ts diff --git a/tests/cases/fourslash_old/formattingForLoopSemicolons.ts b/tests/cases/fourslash/formattingForLoopSemicolons.ts similarity index 100% rename from tests/cases/fourslash_old/formattingForLoopSemicolons.ts rename to tests/cases/fourslash/formattingForLoopSemicolons.ts diff --git a/tests/cases/fourslash_old/formattingObjectLiteral.ts b/tests/cases/fourslash/formattingObjectLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/formattingObjectLiteral.ts rename to tests/cases/fourslash/formattingObjectLiteral.ts diff --git a/tests/cases/fourslash_old/formattingOfChainedLambda.ts b/tests/cases/fourslash/formattingOfChainedLambda.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOfChainedLambda.ts rename to tests/cases/fourslash/formattingOfChainedLambda.ts diff --git a/tests/cases/fourslash_old/formattingOfModuleExport.ts b/tests/cases/fourslash/formattingOfModuleExport.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOfModuleExport.ts rename to tests/cases/fourslash/formattingOfModuleExport.ts diff --git a/tests/cases/fourslash_old/formattingOfMultilineBlockConstructs.ts b/tests/cases/fourslash/formattingOfMultilineBlockConstructs.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOfMultilineBlockConstructs.ts rename to tests/cases/fourslash/formattingOfMultilineBlockConstructs.ts diff --git a/tests/cases/fourslash_old/formattingOnClasses.ts b/tests/cases/fourslash/formattingOnClasses.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnClasses.ts rename to tests/cases/fourslash/formattingOnClasses.ts diff --git a/tests/cases/fourslash_old/formattingOnCloseBrace.ts b/tests/cases/fourslash/formattingOnCloseBrace.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnCloseBrace.ts rename to tests/cases/fourslash/formattingOnCloseBrace.ts diff --git a/tests/cases/fourslash_old/formattingOnClosingBracket.ts b/tests/cases/fourslash/formattingOnClosingBracket.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnClosingBracket.ts rename to tests/cases/fourslash/formattingOnClosingBracket.ts diff --git a/tests/cases/fourslash_old/formattingOnCommaOperator.ts b/tests/cases/fourslash/formattingOnCommaOperator.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnCommaOperator.ts rename to tests/cases/fourslash/formattingOnCommaOperator.ts diff --git a/tests/cases/fourslash_old/formattingOnDoWhileNoSemicolon.ts b/tests/cases/fourslash/formattingOnDoWhileNoSemicolon.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnDoWhileNoSemicolon.ts rename to tests/cases/fourslash/formattingOnDoWhileNoSemicolon.ts diff --git a/tests/cases/fourslash_old/formattingOnDocumentReadyFunction.ts b/tests/cases/fourslash/formattingOnDocumentReadyFunction.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnDocumentReadyFunction.ts rename to tests/cases/fourslash/formattingOnDocumentReadyFunction.ts diff --git a/tests/cases/fourslash_old/formattingOnEmptyInterfaceLiteral.ts b/tests/cases/fourslash/formattingOnEmptyInterfaceLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnEmptyInterfaceLiteral.ts rename to tests/cases/fourslash/formattingOnEmptyInterfaceLiteral.ts diff --git a/tests/cases/fourslash_old/formattingOnEnter.ts b/tests/cases/fourslash/formattingOnEnter.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnEnter.ts rename to tests/cases/fourslash/formattingOnEnter.ts diff --git a/tests/cases/fourslash_old/formattingOnEnterInComments.ts b/tests/cases/fourslash/formattingOnEnterInComments.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnEnterInComments.ts rename to tests/cases/fourslash/formattingOnEnterInComments.ts diff --git a/tests/cases/fourslash_old/formattingOnEnterInStrings.ts b/tests/cases/fourslash/formattingOnEnterInStrings.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnEnterInStrings.ts rename to tests/cases/fourslash/formattingOnEnterInStrings.ts diff --git a/tests/cases/fourslash_old/formattingOnInterfaces.ts b/tests/cases/fourslash/formattingOnInterfaces.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnInterfaces.ts rename to tests/cases/fourslash/formattingOnInterfaces.ts diff --git a/tests/cases/fourslash_old/formattingOnInvalidCodes.ts b/tests/cases/fourslash/formattingOnInvalidCodes.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnInvalidCodes.ts rename to tests/cases/fourslash/formattingOnInvalidCodes.ts diff --git a/tests/cases/fourslash_old/formattingOnModuleIndentation.ts b/tests/cases/fourslash/formattingOnModuleIndentation.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnModuleIndentation.ts rename to tests/cases/fourslash/formattingOnModuleIndentation.ts diff --git a/tests/cases/fourslash_old/formattingOnNestedDoWhileByEnter.ts b/tests/cases/fourslash/formattingOnNestedDoWhileByEnter.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnNestedDoWhileByEnter.ts rename to tests/cases/fourslash/formattingOnNestedDoWhileByEnter.ts diff --git a/tests/cases/fourslash_old/formattingOnNestedStatements.ts b/tests/cases/fourslash/formattingOnNestedStatements.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnNestedStatements.ts rename to tests/cases/fourslash/formattingOnNestedStatements.ts diff --git a/tests/cases/fourslash_old/formattingOnObjectLiteral.ts b/tests/cases/fourslash/formattingOnObjectLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnObjectLiteral.ts rename to tests/cases/fourslash/formattingOnObjectLiteral.ts diff --git a/tests/cases/fourslash_old/formattingOnOpenBraceOfFunctions.ts b/tests/cases/fourslash/formattingOnOpenBraceOfFunctions.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnOpenBraceOfFunctions.ts rename to tests/cases/fourslash/formattingOnOpenBraceOfFunctions.ts diff --git a/tests/cases/fourslash_old/formattingOnSemiColon.ts b/tests/cases/fourslash/formattingOnSemiColon.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnSemiColon.ts rename to tests/cases/fourslash/formattingOnSemiColon.ts diff --git a/tests/cases/fourslash_old/formattingOnSingleLineBlocks.ts b/tests/cases/fourslash/formattingOnSingleLineBlocks.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnSingleLineBlocks.ts rename to tests/cases/fourslash/formattingOnSingleLineBlocks.ts diff --git a/tests/cases/fourslash_old/formattingOnStatementsWithNoSemicolon.ts b/tests/cases/fourslash/formattingOnStatementsWithNoSemicolon.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnStatementsWithNoSemicolon.ts rename to tests/cases/fourslash/formattingOnStatementsWithNoSemicolon.ts diff --git a/tests/cases/fourslash_old/formattingOnTabAfterCloseCurly.ts b/tests/cases/fourslash/formattingOnTabAfterCloseCurly.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnTabAfterCloseCurly.ts rename to tests/cases/fourslash/formattingOnTabAfterCloseCurly.ts diff --git a/tests/cases/fourslash_old/formattingOnVariety.ts b/tests/cases/fourslash/formattingOnVariety.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOnVariety.ts rename to tests/cases/fourslash/formattingOnVariety.ts diff --git a/tests/cases/fourslash_old/formattingOptionsChange.ts b/tests/cases/fourslash/formattingOptionsChange.ts similarity index 100% rename from tests/cases/fourslash_old/formattingOptionsChange.ts rename to tests/cases/fourslash/formattingOptionsChange.ts diff --git a/tests/cases/fourslash_old/formattingSingleLineWithNewLineOptionSet.ts b/tests/cases/fourslash/formattingSingleLineWithNewLineOptionSet.ts similarity index 100% rename from tests/cases/fourslash_old/formattingSingleLineWithNewLineOptionSet.ts rename to tests/cases/fourslash/formattingSingleLineWithNewLineOptionSet.ts diff --git a/tests/cases/fourslash_old/formattingSkippedTokens.ts b/tests/cases/fourslash/formattingSkippedTokens.ts similarity index 100% rename from tests/cases/fourslash_old/formattingSkippedTokens.ts rename to tests/cases/fourslash/formattingSkippedTokens.ts diff --git a/tests/cases/fourslash_old/formattingSpacesAfterConstructor.ts b/tests/cases/fourslash/formattingSpacesAfterConstructor.ts similarity index 100% rename from tests/cases/fourslash_old/formattingSpacesAfterConstructor.ts rename to tests/cases/fourslash/formattingSpacesAfterConstructor.ts diff --git a/tests/cases/fourslash_old/formattingVoid.ts b/tests/cases/fourslash/formattingVoid.ts similarity index 100% rename from tests/cases/fourslash_old/formattingVoid.ts rename to tests/cases/fourslash/formattingVoid.ts diff --git a/tests/cases/fourslash_old/formattingWithEnterAfterMultilineString.ts b/tests/cases/fourslash/formattingWithEnterAfterMultilineString.ts similarity index 100% rename from tests/cases/fourslash_old/formattingWithEnterAfterMultilineString.ts rename to tests/cases/fourslash/formattingWithEnterAfterMultilineString.ts diff --git a/tests/cases/fourslash_old/formattingWithLimitedSpan.ts b/tests/cases/fourslash/formattingWithLimitedSpan.ts similarity index 100% rename from tests/cases/fourslash_old/formattingWithLimitedSpan.ts rename to tests/cases/fourslash/formattingWithLimitedSpan.ts diff --git a/tests/cases/fourslash_old/formattingofSingleLineBlockConstructs.ts b/tests/cases/fourslash/formattingofSingleLineBlockConstructs.ts similarity index 100% rename from tests/cases/fourslash_old/formattingofSingleLineBlockConstructs.ts rename to tests/cases/fourslash/formattingofSingleLineBlockConstructs.ts diff --git a/tests/cases/fourslash_old/functionFormatting.ts b/tests/cases/fourslash/functionFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/functionFormatting.ts rename to tests/cases/fourslash/functionFormatting.ts diff --git a/tests/cases/fourslash_old/functionTypeFormatting.ts b/tests/cases/fourslash/functionTypeFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/functionTypeFormatting.ts rename to tests/cases/fourslash/functionTypeFormatting.ts diff --git a/tests/cases/fourslash_old/genericsFormatting.ts b/tests/cases/fourslash/genericsFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/genericsFormatting.ts rename to tests/cases/fourslash/genericsFormatting.ts diff --git a/tests/cases/fourslash_old/indentionsOfCommentBlockAfterFormatting.ts b/tests/cases/fourslash/indentionsOfCommentBlockAfterFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/indentionsOfCommentBlockAfterFormatting.ts rename to tests/cases/fourslash/indentionsOfCommentBlockAfterFormatting.ts diff --git a/tests/cases/fourslash_old/semicolonFormatting.ts b/tests/cases/fourslash/semicolonFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/semicolonFormatting.ts rename to tests/cases/fourslash/semicolonFormatting.ts diff --git a/tests/cases/fourslash_old/semicolonFormattingAfterArrayLiteral.ts b/tests/cases/fourslash/semicolonFormattingAfterArrayLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/semicolonFormattingAfterArrayLiteral.ts rename to tests/cases/fourslash/semicolonFormattingAfterArrayLiteral.ts diff --git a/tests/cases/fourslash_old/semicolonFormattingInsideAComment.ts b/tests/cases/fourslash/semicolonFormattingInsideAComment.ts similarity index 100% rename from tests/cases/fourslash_old/semicolonFormattingInsideAComment.ts rename to tests/cases/fourslash/semicolonFormattingInsideAComment.ts diff --git a/tests/cases/fourslash_old/semicolonFormattingInsideAStringLiteral.ts b/tests/cases/fourslash/semicolonFormattingInsideAStringLiteral.ts similarity index 100% rename from tests/cases/fourslash_old/semicolonFormattingInsideAStringLiteral.ts rename to tests/cases/fourslash/semicolonFormattingInsideAStringLiteral.ts diff --git a/tests/cases/fourslash_old/semicolonFormattingNestedStatements.ts b/tests/cases/fourslash/semicolonFormattingNestedStatements.ts similarity index 100% rename from tests/cases/fourslash_old/semicolonFormattingNestedStatements.ts rename to tests/cases/fourslash/semicolonFormattingNestedStatements.ts diff --git a/tests/cases/fourslash_old/semicolonFormattingNewline.ts b/tests/cases/fourslash/semicolonFormattingNewline.ts similarity index 100% rename from tests/cases/fourslash_old/semicolonFormattingNewline.ts rename to tests/cases/fourslash/semicolonFormattingNewline.ts diff --git a/tests/cases/fourslash_old/singleLineTypeLiteralFormatting.ts b/tests/cases/fourslash/singleLineTypeLiteralFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/singleLineTypeLiteralFormatting.ts rename to tests/cases/fourslash/singleLineTypeLiteralFormatting.ts diff --git a/tests/cases/fourslash_old/tryCatchFinallyFormating.ts b/tests/cases/fourslash/tryCatchFinallyFormating.ts similarity index 100% rename from tests/cases/fourslash_old/tryCatchFinallyFormating.ts rename to tests/cases/fourslash/tryCatchFinallyFormating.ts diff --git a/tests/cases/fourslash_old/unclosedStringLiteralAutoformating.ts b/tests/cases/fourslash/unclosedStringLiteralAutoformating.ts similarity index 100% rename from tests/cases/fourslash_old/unclosedStringLiteralAutoformating.ts rename to tests/cases/fourslash/unclosedStringLiteralAutoformating.ts diff --git a/tests/cases/fourslash_old/whiteSpaceBeforeReturnTypeFormatting.ts b/tests/cases/fourslash/whiteSpaceBeforeReturnTypeFormatting.ts similarity index 100% rename from tests/cases/fourslash_old/whiteSpaceBeforeReturnTypeFormatting.ts rename to tests/cases/fourslash/whiteSpaceBeforeReturnTypeFormatting.ts