diff --git a/src/extension.ts b/src/extension.ts
index 675e8b58..e05d815c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -4,8 +4,8 @@ import { AblFormatterProvider } from "./providers/AblFormatterProvider";
 import { Constants } from "./model/Constants";
 import { AblParserHelper } from "./parser/AblParserHelper";
 import { AblDebugHoverProvider } from "./providers/AblDebugHoverProvider";
-import { ConfigurationManager2 } from "./utils/ConfigurationManager";
-import { enableFormatterDecorators } from "./v2/formatterFramework/enableFormatterDecorators";
+import { ConfigurationManager } from "./utils/ConfigurationManager";
+import { enableFormatterDecorators } from "./formatterFramework/enableFormatterDecorators";
 import { DebugManager } from "./providers/DebugManager";
 
 export async function activate(context: vscode.ExtensionContext) {
@@ -13,7 +13,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
     await Parser.init().then(() => {});
 
-    ConfigurationManager2.getInstance();
+    ConfigurationManager.getInstance();
     enableFormatterDecorators();
 
     const parserHelper = new AblParserHelper(
diff --git a/src/v2/formatterFramework/FormatterFactory.ts b/src/formatterFramework/FormatterFactory.ts
similarity index 93%
rename from src/v2/formatterFramework/FormatterFactory.ts
rename to src/formatterFramework/FormatterFactory.ts
index 177486d4..b2d79dec 100644
--- a/src/v2/formatterFramework/FormatterFactory.ts
+++ b/src/formatterFramework/FormatterFactory.ts
@@ -1,4 +1,4 @@
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
 import { IFormatter } from "./IFormatter";
 import { formatterRegistry } from "./formatterDecorator";
 
diff --git a/src/v2/formatterFramework/FormatterHelper.ts b/src/formatterFramework/FormatterHelper.ts
similarity index 94%
rename from src/v2/formatterFramework/FormatterHelper.ts
rename to src/formatterFramework/FormatterHelper.ts
index 443e5748..a0391b11 100644
--- a/src/v2/formatterFramework/FormatterHelper.ts
+++ b/src/formatterFramework/FormatterHelper.ts
@@ -1,6 +1,6 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { FullText } from "../model/FullText";
-import { SyntaxNodeType } from "../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../model/SyntaxNodeType";
 import { log } from "console";
 
 export class FormatterHelper {
@@ -116,7 +116,10 @@ export class FormatterHelper {
             return index === 0
                 ? line
                 : " ".repeat(
-                      Math.max(0, FormatterHelper.countLeadingSpaces(line) + moveDelta)
+                      Math.max(
+                          0,
+                          FormatterHelper.countLeadingSpaces(line) + moveDelta
+                      )
                   ) + line.trim();
         });
 
diff --git a/src/v2/formatterFramework/FormattingEngine.ts b/src/formatterFramework/FormattingEngine.ts
similarity index 95%
rename from src/v2/formatterFramework/FormattingEngine.ts
rename to src/formatterFramework/FormattingEngine.ts
index 49ef72fb..a4c6beb3 100644
--- a/src/v2/formatterFramework/FormattingEngine.ts
+++ b/src/formatterFramework/FormattingEngine.ts
@@ -1,15 +1,15 @@
 import { SyntaxNode, Tree } from "web-tree-sitter";
-import { IParserHelper } from "../../parser/IParserHelper";
-import { FileIdentifier } from "../../model/FileIdentifier";
+import { IParserHelper } from "../parser/IParserHelper";
+import { FileIdentifier } from "../model/FileIdentifier";
 import { IFormatter } from "./IFormatter";
 import { BlockFormater } from "../formatters/block/BlockFormatter";
 import { CodeEdit } from "../model/CodeEdit";
 import { FullText } from "../model/FullText";
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
-import { ParseResult } from "../../model/ParseResult";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
+import { ParseResult } from "../model/ParseResult";
 import { FormatterFactory } from "./FormatterFactory";
 import { EOL } from "../model/EOL";
-import { IDebugManager } from "../../providers/IDebugManager";
+import { IDebugManager } from "../providers/IDebugManager";
 
 export class FormattingEngine {
     private numOfCodeEdits: number = 0;
diff --git a/src/v2/formatterFramework/IFormatter.ts b/src/formatterFramework/IFormatter.ts
similarity index 100%
rename from src/v2/formatterFramework/IFormatter.ts
rename to src/formatterFramework/IFormatter.ts
diff --git a/src/v2/formatterFramework/enableFormatterDecorators.ts b/src/formatterFramework/enableFormatterDecorators.ts
similarity index 100%
rename from src/v2/formatterFramework/enableFormatterDecorators.ts
rename to src/formatterFramework/enableFormatterDecorators.ts
diff --git a/src/v2/formatterFramework/formatterDecorator.ts b/src/formatterFramework/formatterDecorator.ts
similarity index 100%
rename from src/v2/formatterFramework/formatterDecorator.ts
rename to src/formatterFramework/formatterDecorator.ts
diff --git a/src/v2/formatters/AFormatter.ts b/src/formatters/AFormatter.ts
similarity index 75%
rename from src/v2/formatters/AFormatter.ts
rename to src/formatters/AFormatter.ts
index 6b8a4505..0f841f35 100644
--- a/src/v2/formatters/AFormatter.ts
+++ b/src/formatters/AFormatter.ts
@@ -1,5 +1,5 @@
 import { SyntaxNode } from "web-tree-sitter";
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
 import { CodeEdit } from "../model/CodeEdit";
 import { FullText } from "../model/FullText";
 
@@ -17,9 +17,12 @@ export abstract class AFormatter {
         fullText: FullText
     ): CodeEdit {
         const diff = newText.length - oldText.length;
-        const rowDiff = newText.split(fullText.eolDelimiter).length - oldText.split(fullText.eolDelimiter).length;
-        const lastRowColumn =
-            newText.split(fullText.eolDelimiter)[newText.split(fullText.eolDelimiter).length - 1].length;
+        const rowDiff =
+            newText.split(fullText.eolDelimiter).length -
+            oldText.split(fullText.eolDelimiter).length;
+        const lastRowColumn = newText.split(fullText.eolDelimiter)[
+            newText.split(fullText.eolDelimiter).length - 1
+        ].length;
 
         return {
             text: newText,
@@ -36,4 +39,4 @@ export abstract class AFormatter {
             },
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/v2/formatters/ASettings.ts b/src/formatters/ASettings.ts
similarity index 80%
rename from src/v2/formatters/ASettings.ts
rename to src/formatters/ASettings.ts
index acd7c9b7..0b799c3b 100644
--- a/src/v2/formatters/ASettings.ts
+++ b/src/formatters/ASettings.ts
@@ -1,4 +1,4 @@
-import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../utils/IConfigurationManager";
 
 export abstract class ASettings {
     public constructor(
diff --git a/src/v2/formatters/arrayAccess/ArrayAccessFormatter.ts b/src/formatters/arrayAccess/ArrayAccessFormatter.ts
similarity index 95%
rename from src/v2/formatters/arrayAccess/ArrayAccessFormatter.ts
rename to src/formatters/arrayAccess/ArrayAccessFormatter.ts
index ce68d1ab..84cd9e6b 100644
--- a/src/v2/formatters/arrayAccess/ArrayAccessFormatter.ts
+++ b/src/formatters/arrayAccess/ArrayAccessFormatter.ts
@@ -1,12 +1,12 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { ArrayAccessSettings } from "./ArrayAccessSettings";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/arrayAccess/ArrayAccessSettings.ts b/src/formatters/arrayAccess/ArrayAccessSettings.ts
similarity index 100%
rename from src/v2/formatters/arrayAccess/ArrayAccessSettings.ts
rename to src/formatters/arrayAccess/ArrayAccessSettings.ts
diff --git a/src/v2/formatters/assign/AssignFormatter.ts b/src/formatters/assign/AssignFormatter.ts
similarity index 97%
rename from src/v2/formatters/assign/AssignFormatter.ts
rename to src/formatters/assign/AssignFormatter.ts
index 9bdebcef..298e4b8b 100644
--- a/src/v2/formatters/assign/AssignFormatter.ts
+++ b/src/formatters/assign/AssignFormatter.ts
@@ -4,10 +4,10 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AssignSettings } from "./AssignSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class AssignFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/assign/AssignSettings.ts b/src/formatters/assign/AssignSettings.ts
similarity index 100%
rename from src/v2/formatters/assign/AssignSettings.ts
rename to src/formatters/assign/AssignSettings.ts
diff --git a/src/v2/formatters/block/BlockFormatter.ts b/src/formatters/block/BlockFormatter.ts
similarity index 98%
rename from src/v2/formatters/block/BlockFormatter.ts
rename to src/formatters/block/BlockFormatter.ts
index a32c4228..9bed4392 100644
--- a/src/v2/formatters/block/BlockFormatter.ts
+++ b/src/formatters/block/BlockFormatter.ts
@@ -1,15 +1,12 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import {
-    bodyBlockKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { bodyBlockKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { BlockSettings } from "./BlockSettings";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/block/BlockSettings.ts b/src/formatters/block/BlockSettings.ts
similarity index 100%
rename from src/v2/formatters/block/BlockSettings.ts
rename to src/formatters/block/BlockSettings.ts
diff --git a/src/v2/formatters/body/BodyFormatter.ts b/src/formatters/body/BodyFormatter.ts
similarity index 94%
rename from src/v2/formatters/body/BodyFormatter.ts
rename to src/formatters/body/BodyFormatter.ts
index 6c8561fa..d02fc11d 100644
--- a/src/v2/formatters/body/BodyFormatter.ts
+++ b/src/formatters/body/BodyFormatter.ts
@@ -5,11 +5,8 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { BodySettings } from "./BodySettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import {
-    bodyBlockKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { bodyBlockKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/body/BodySettings.ts b/src/formatters/body/BodySettings.ts
similarity index 100%
rename from src/v2/formatters/body/BodySettings.ts
rename to src/formatters/body/BodySettings.ts
diff --git a/src/v2/formatters/case/CaseFormatter.ts b/src/formatters/case/CaseFormatter.ts
similarity index 97%
rename from src/v2/formatters/case/CaseFormatter.ts
rename to src/formatters/case/CaseFormatter.ts
index 2ccc3974..af6ef8e4 100644
--- a/src/v2/formatters/case/CaseFormatter.ts
+++ b/src/formatters/case/CaseFormatter.ts
@@ -4,12 +4,12 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { CaseSettings } from "./CaseSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import {
     afterThenStatements,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/case/CaseSettings.ts b/src/formatters/case/CaseSettings.ts
similarity index 100%
rename from src/v2/formatters/case/CaseSettings.ts
rename to src/formatters/case/CaseSettings.ts
diff --git a/src/v2/formatters/enum/EnumFormatter.ts b/src/formatters/enum/EnumFormatter.ts
similarity index 96%
rename from src/v2/formatters/enum/EnumFormatter.ts
rename to src/formatters/enum/EnumFormatter.ts
index b095458b..8318a68d 100644
--- a/src/v2/formatters/enum/EnumFormatter.ts
+++ b/src/formatters/enum/EnumFormatter.ts
@@ -5,8 +5,8 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { EnumSettings } from "./EnumSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/enum/EnumSettings.ts b/src/formatters/enum/EnumSettings.ts
similarity index 100%
rename from src/v2/formatters/enum/EnumSettings.ts
rename to src/formatters/enum/EnumSettings.ts
diff --git a/src/v2/formatters/expression/ExpressionFormatter.ts b/src/formatters/expression/ExpressionFormatter.ts
similarity index 94%
rename from src/v2/formatters/expression/ExpressionFormatter.ts
rename to src/formatters/expression/ExpressionFormatter.ts
index 4d0d829b..9c56e45c 100644
--- a/src/v2/formatters/expression/ExpressionFormatter.ts
+++ b/src/formatters/expression/ExpressionFormatter.ts
@@ -4,9 +4,9 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { ExpressionSettings } from "./ExpressionSettings";
-import { logicalKeywords, SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { logicalKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/expression/ExpressionSettings.ts b/src/formatters/expression/ExpressionSettings.ts
similarity index 100%
rename from src/v2/formatters/expression/ExpressionSettings.ts
rename to src/formatters/expression/ExpressionSettings.ts
diff --git a/src/v2/formatters/find/FindFormatter.ts b/src/formatters/find/FindFormatter.ts
similarity index 94%
rename from src/v2/formatters/find/FindFormatter.ts
rename to src/formatters/find/FindFormatter.ts
index f48a3213..c69076df 100644
--- a/src/v2/formatters/find/FindFormatter.ts
+++ b/src/formatters/find/FindFormatter.ts
@@ -1,13 +1,13 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import { FindSettings } from "./FindSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class FindFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/find/FindSettings.ts b/src/formatters/find/FindSettings.ts
similarity index 100%
rename from src/v2/formatters/find/FindSettings.ts
rename to src/formatters/find/FindSettings.ts
diff --git a/src/v2/formatters/for/ForFormatter.ts b/src/formatters/for/ForFormatter.ts
similarity index 95%
rename from src/v2/formatters/for/ForFormatter.ts
rename to src/formatters/for/ForFormatter.ts
index 0ab309dc..9551b253 100644
--- a/src/v2/formatters/for/ForFormatter.ts
+++ b/src/formatters/for/ForFormatter.ts
@@ -1,13 +1,13 @@
 import { SyntaxNode } from "web-tree-sitter";
 import { IFormatter } from "../../formatterFramework/IFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { AFormatter } from "../AFormatter";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import { ForSettings } from "./ForSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class ForFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/for/ForSettings.ts b/src/formatters/for/ForSettings.ts
similarity index 100%
rename from src/v2/formatters/for/ForSettings.ts
rename to src/formatters/for/ForSettings.ts
diff --git a/src/v2/formatters/functionParameter/FunctionParameterFormatter.ts b/src/formatters/functionParameter/FunctionParameterFormatter.ts
similarity index 96%
rename from src/v2/formatters/functionParameter/FunctionParameterFormatter.ts
rename to src/formatters/functionParameter/FunctionParameterFormatter.ts
index 1a1d2a96..d71edd28 100644
--- a/src/v2/formatters/functionParameter/FunctionParameterFormatter.ts
+++ b/src/formatters/functionParameter/FunctionParameterFormatter.ts
@@ -10,9 +10,9 @@ import {
     parameterTypes,
     parentheses,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { FunctionParameterSettings } from "./FunctionParameterSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/functionParameter/FunctionParameterSettings.ts b/src/formatters/functionParameter/FunctionParameterSettings.ts
similarity index 100%
rename from src/v2/formatters/functionParameter/FunctionParameterSettings.ts
rename to src/formatters/functionParameter/FunctionParameterSettings.ts
diff --git a/src/v2/formatters/if/IfFormatter.ts b/src/formatters/if/IfFormatter.ts
similarity index 98%
rename from src/v2/formatters/if/IfFormatter.ts
rename to src/formatters/if/IfFormatter.ts
index b75e2c38..a162871f 100644
--- a/src/v2/formatters/if/IfFormatter.ts
+++ b/src/formatters/if/IfFormatter.ts
@@ -4,12 +4,12 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { IfSettings } from "./IfSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { RegisterFormatter } from "../../formatterFramework/formatterDecorator";
 import {
     afterThenStatements,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/if/IfSettings.ts b/src/formatters/if/IfSettings.ts
similarity index 100%
rename from src/v2/formatters/if/IfSettings.ts
rename to src/formatters/if/IfSettings.ts
diff --git a/src/v2/formatters/ifFunction/IfFunctionFormatter.ts b/src/formatters/ifFunction/IfFunctionFormatter.ts
similarity index 95%
rename from src/v2/formatters/ifFunction/IfFunctionFormatter.ts
rename to src/formatters/ifFunction/IfFunctionFormatter.ts
index 28343559..1a22c938 100644
--- a/src/v2/formatters/ifFunction/IfFunctionFormatter.ts
+++ b/src/formatters/ifFunction/IfFunctionFormatter.ts
@@ -5,8 +5,8 @@ import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { IfFunctionSettings } from "./IfFunctionSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/ifFunction/IfFunctionSettings.ts b/src/formatters/ifFunction/IfFunctionSettings.ts
similarity index 100%
rename from src/v2/formatters/ifFunction/IfFunctionSettings.ts
rename to src/formatters/ifFunction/IfFunctionSettings.ts
diff --git a/src/v2/formatters/procedureParameter/ProcedureParameterFormatter.ts b/src/formatters/procedureParameter/ProcedureParameterFormatter.ts
similarity index 95%
rename from src/v2/formatters/procedureParameter/ProcedureParameterFormatter.ts
rename to src/formatters/procedureParameter/ProcedureParameterFormatter.ts
index bf15e30b..83eb3818 100644
--- a/src/v2/formatters/procedureParameter/ProcedureParameterFormatter.ts
+++ b/src/formatters/procedureParameter/ProcedureParameterFormatter.ts
@@ -8,9 +8,9 @@ import {
     definitionKeywords,
     parameterTypes,
     SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+} from "../../model/SyntaxNodeType";
 import { ProcedureParameterSettings } from "./ProcedureParameterSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/procedureParameter/ProcedureParameterSettings.ts b/src/formatters/procedureParameter/ProcedureParameterSettings.ts
similarity index 100%
rename from src/v2/formatters/procedureParameter/ProcedureParameterSettings.ts
rename to src/formatters/procedureParameter/ProcedureParameterSettings.ts
diff --git a/src/v2/formatters/property/PropertyFormatter.ts b/src/formatters/property/PropertyFormatter.ts
similarity index 92%
rename from src/v2/formatters/property/PropertyFormatter.ts
rename to src/formatters/property/PropertyFormatter.ts
index 4c901cfb..6592d7d4 100644
--- a/src/v2/formatters/property/PropertyFormatter.ts
+++ b/src/formatters/property/PropertyFormatter.ts
@@ -4,13 +4,10 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import {
-    definitionKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { definitionKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { PropertySettings } from "./PropertySettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class PropertyFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/property/PropertySettings.ts b/src/formatters/property/PropertySettings.ts
similarity index 100%
rename from src/v2/formatters/property/PropertySettings.ts
rename to src/formatters/property/PropertySettings.ts
diff --git a/src/v2/formatters/statement/StatementFormatter.ts b/src/formatters/statement/StatementFormatter.ts
similarity index 95%
rename from src/v2/formatters/statement/StatementFormatter.ts
rename to src/formatters/statement/StatementFormatter.ts
index bd9157b1..9d4ddecc 100644
--- a/src/v2/formatters/statement/StatementFormatter.ts
+++ b/src/formatters/statement/StatementFormatter.ts
@@ -4,10 +4,10 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { StatementSettings } from "./StatementSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 
 @RegisterFormatter
 export class StatementFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/statement/StatementSettings.ts b/src/formatters/statement/StatementSettings.ts
similarity index 100%
rename from src/v2/formatters/statement/StatementSettings.ts
rename to src/formatters/statement/StatementSettings.ts
diff --git a/src/v2/formatters/tempTable/TempTableFormatter.ts b/src/formatters/tempTable/TempTableFormatter.ts
similarity index 95%
rename from src/v2/formatters/tempTable/TempTableFormatter.ts
rename to src/formatters/tempTable/TempTableFormatter.ts
index d70df080..851b2419 100644
--- a/src/v2/formatters/tempTable/TempTableFormatter.ts
+++ b/src/formatters/tempTable/TempTableFormatter.ts
@@ -6,11 +6,8 @@ import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { TempTableSettings } from "./TempTableSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
-import {
-    definitionKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
+import { definitionKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 
 @RegisterFormatter
 export class TempTableFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/tempTable/TempTableSettings.ts b/src/formatters/tempTable/TempTableSettings.ts
similarity index 100%
rename from src/v2/formatters/tempTable/TempTableSettings.ts
rename to src/formatters/tempTable/TempTableSettings.ts
diff --git a/src/v2/formatters/using/UsingFormatter.ts b/src/formatters/using/UsingFormatter.ts
similarity index 94%
rename from src/v2/formatters/using/UsingFormatter.ts
rename to src/formatters/using/UsingFormatter.ts
index 88d69718..22478ac8 100644
--- a/src/v2/formatters/using/UsingFormatter.ts
+++ b/src/formatters/using/UsingFormatter.ts
@@ -4,10 +4,10 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 import { UsingSettings } from "./UsingSettings";
-import { SyntaxNodeType } from "../../../model/SyntaxNodeType";
+import { SyntaxNodeType } from "../../model/SyntaxNodeType";
 
 @RegisterFormatter
 export class UsingFormatter extends AFormatter implements IFormatter {
diff --git a/src/v2/formatters/using/UsingSettings.ts b/src/formatters/using/UsingSettings.ts
similarity index 100%
rename from src/v2/formatters/using/UsingSettings.ts
rename to src/formatters/using/UsingSettings.ts
diff --git a/src/v2/formatters/variableDefinition/VariableDefinitionFormatter.ts b/src/formatters/variableDefinition/VariableDefinitionFormatter.ts
similarity index 95%
rename from src/v2/formatters/variableDefinition/VariableDefinitionFormatter.ts
rename to src/formatters/variableDefinition/VariableDefinitionFormatter.ts
index f893b115..601808ad 100644
--- a/src/v2/formatters/variableDefinition/VariableDefinitionFormatter.ts
+++ b/src/formatters/variableDefinition/VariableDefinitionFormatter.ts
@@ -4,12 +4,9 @@ import { IFormatter } from "../../formatterFramework/IFormatter";
 import { CodeEdit } from "../../model/CodeEdit";
 import { FullText } from "../../model/FullText";
 import { AFormatter } from "../AFormatter";
-import {
-    definitionKeywords,
-    SyntaxNodeType,
-} from "../../../model/SyntaxNodeType";
+import { definitionKeywords, SyntaxNodeType } from "../../model/SyntaxNodeType";
 import { VariableDefinitionSettings } from "./VariableDefinitionSettings";
-import { IConfigurationManager } from "../../../utils/IConfigurationManager";
+import { IConfigurationManager } from "../../utils/IConfigurationManager";
 import { FormatterHelper } from "../../formatterFramework/FormatterHelper";
 
 @RegisterFormatter
diff --git a/src/v2/formatters/variableDefinition/VariableDefinitionSettings.ts b/src/formatters/variableDefinition/VariableDefinitionSettings.ts
similarity index 100%
rename from src/v2/formatters/variableDefinition/VariableDefinitionSettings.ts
rename to src/formatters/variableDefinition/VariableDefinitionSettings.ts
diff --git a/src/v2/model/CodeEdit.ts b/src/model/CodeEdit.ts
similarity index 100%
rename from src/v2/model/CodeEdit.ts
rename to src/model/CodeEdit.ts
diff --git a/src/v2/model/EOL.ts b/src/model/EOL.ts
similarity index 100%
rename from src/v2/model/EOL.ts
rename to src/model/EOL.ts
diff --git a/src/v2/model/FullText.ts b/src/model/FullText.ts
similarity index 100%
rename from src/v2/model/FullText.ts
rename to src/model/FullText.ts
diff --git a/src/providers/AblFormatterProvider.ts b/src/providers/AblFormatterProvider.ts
index ff891f3a..d360f729 100644
--- a/src/providers/AblFormatterProvider.ts
+++ b/src/providers/AblFormatterProvider.ts
@@ -1,9 +1,9 @@
 import * as vscode from "vscode";
 import { IParserHelper } from "../parser/IParserHelper";
 import { FileIdentifier } from "../model/FileIdentifier";
-import { FormattingEngine } from "../v2/formatterFramework/FormattingEngine";
-import { ConfigurationManager2 } from "../utils/ConfigurationManager";
-import { EOL } from "../v2/model/EOL";
+import { FormattingEngine } from "../formatterFramework/FormattingEngine";
+import { ConfigurationManager } from "../utils/ConfigurationManager";
+import { EOL } from "../model/EOL";
 import { DebugManager } from "./DebugManager";
 
 export class AblFormatterProvider
@@ -23,7 +23,7 @@ export class AblFormatterProvider
     ): vscode.ProviderResult<vscode.TextEdit[]> {
         console.log("AblFormatterProvider.provideDocumentFormattingEdits");
 
-        const configurationManager = ConfigurationManager2.getInstance();
+        const configurationManager = ConfigurationManager.getInstance();
         const debugManager = DebugManager.getInstance();
 
         configurationManager.setTabSize(options.tabSize);
@@ -66,7 +66,7 @@ export class AblFormatterProvider
     ): vscode.ProviderResult<vscode.TextEdit[]> {
         console.log("AblFormatterProvider.provideDocumentFormattingEdits");
 
-        const configurationManager = ConfigurationManager2.getInstance();
+        const configurationManager = ConfigurationManager.getInstance();
         const debugManager = DebugManager.getInstance();
 
         try {
diff --git a/src/providers/DebugManager.ts b/src/providers/DebugManager.ts
index ba43de71..8e844de3 100644
--- a/src/providers/DebugManager.ts
+++ b/src/providers/DebugManager.ts
@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import { SyntaxNode, Tree } from "web-tree-sitter";
 import { SyntaxNodeType } from "../model/SyntaxNodeType";
-import { ConfigurationManager2 } from "../utils/ConfigurationManager";
+import { ConfigurationManager } from "../utils/ConfigurationManager";
 import { IDebugManager } from "./IDebugManager";
 
 export class DebugManager implements IDebugManager {
@@ -183,7 +183,7 @@ export class DebugManager implements IDebugManager {
 
     public isInDebugMode(): boolean {
         return (
-            ConfigurationManager2.getInstance().get("showTreeInfoOnHover") ===
+            ConfigurationManager.getInstance().get("showTreeInfoOnHover") ===
                 true || this.debugModeOverride
         );
     }
diff --git a/src/stability-test/suite/extension.test.ts b/src/stability-test/suite/extension.test.ts
index ff6d1448..4f32b283 100644
--- a/src/stability-test/suite/extension.test.ts
+++ b/src/stability-test/suite/extension.test.ts
@@ -6,12 +6,12 @@ import * as fs from "fs";
 import * as vscode from "vscode";
 import { AblParserHelper } from "../../parser/AblParserHelper";
 import { FileIdentifier } from "../../model/FileIdentifier";
-import { FormattingEngine } from "../../v2/formatterFramework/FormattingEngine";
-import { ConfigurationManager2 } from "../../utils/ConfigurationManager";
+import { FormattingEngine } from "../../formatterFramework/FormattingEngine";
+import { ConfigurationManager } from "../../utils/ConfigurationManager";
 import Parser from "web-tree-sitter";
-import { enableFormatterDecorators } from "../../v2/formatterFramework/enableFormatterDecorators";
+import { enableFormatterDecorators } from "../../formatterFramework/enableFormatterDecorators";
 import path, { join } from "path";
-import { EOL } from "../../v2/model/EOL";
+import { EOL } from "../../model/EOL";
 import { DebugManagerMock } from "./DebugManagerMock";
 
 let parserHelper: AblParserHelper;
@@ -86,7 +86,7 @@ suite("Extension Test Suite", () => {
 });
 
 function stabilityTest(name: string): void {
-    ConfigurationManager2.getInstance();
+    ConfigurationManager.getInstance();
     enableFormatterDecorators();
 
     const beforeText = settingsOverride + getInput(name);
@@ -139,7 +139,7 @@ function getInput(fileName: string): string {
 }
 
 function format(text: string, name: string): string {
-    const configurationManager = ConfigurationManager2.getInstance();
+    const configurationManager = ConfigurationManager.getInstance();
 
     const codeFormatter = new FormattingEngine(
         parserHelper,
@@ -227,7 +227,7 @@ function parseAndCheckForErrors(
 }
 
 function treeSitterTest(text: string, name: string): void {
-    ConfigurationManager2.getInstance();
+    ConfigurationManager.getInstance();
     enableFormatterDecorators();
 
     const errors = parseAndCheckForErrors(text, name);
diff --git a/src/test/suite/extension.test.ts b/src/test/suite/extension.test.ts
index fcdb1056..4bcd6046 100644
--- a/src/test/suite/extension.test.ts
+++ b/src/test/suite/extension.test.ts
@@ -6,12 +6,12 @@ import * as fs from "fs";
 import * as vscode from "vscode";
 import { AblParserHelper } from "../../parser/AblParserHelper";
 import { FileIdentifier } from "../../model/FileIdentifier";
-import { FormattingEngine } from "../../v2/formatterFramework/FormattingEngine";
-import { ConfigurationManager2 } from "../../utils/ConfigurationManager";
+import { FormattingEngine } from "../../formatterFramework/FormattingEngine";
+import { ConfigurationManager } from "../../utils/ConfigurationManager";
 import Parser from "web-tree-sitter";
-import { enableFormatterDecorators } from "../../v2/formatterFramework/enableFormatterDecorators";
+import { enableFormatterDecorators } from "../../formatterFramework/enableFormatterDecorators";
 import path from "path";
-import { EOL } from "../../v2/model/EOL";
+import { EOL } from "../../model/EOL";
 import { DebugManagerMock } from "./DebugManagerMock";
 
 let parserHelper: AblParserHelper;
@@ -90,7 +90,7 @@ suite("Extension Test Suite", () => {
 });
 
 function functionalTest(name: string): void {
-    ConfigurationManager2.getInstance();
+    ConfigurationManager.getInstance();
     enableFormatterDecorators();
 
     const inputText = getInput(name);
@@ -141,7 +141,7 @@ function getTarget(fileName: string): string {
 }
 
 function format(text: string, name: string): string {
-    const configurationManager = ConfigurationManager2.getInstance();
+    const configurationManager = ConfigurationManager.getInstance();
 
     const codeFormatter = new FormattingEngine(
         parserHelper,
@@ -174,7 +174,7 @@ function getFileEOL(fileText: string): string {
 }
 
 function treeSitterTest(name: string): void {
-    ConfigurationManager2.getInstance();
+    ConfigurationManager.getInstance();
     enableFormatterDecorators();
 
     const errorText = getError(name);
diff --git a/src/utils/ConfigurationManager.ts b/src/utils/ConfigurationManager.ts
index e1b09220..462ca086 100644
--- a/src/utils/ConfigurationManager.ts
+++ b/src/utils/ConfigurationManager.ts
@@ -1,8 +1,8 @@
 import { commands, window, workspace, WorkspaceConfiguration } from "vscode";
 import { IConfigurationManager } from "./IConfigurationManager";
 
-export class ConfigurationManager2 implements IConfigurationManager {
-    private static instance: ConfigurationManager2;
+export class ConfigurationManager implements IConfigurationManager {
+    private static instance: ConfigurationManager;
     private reloadConfig = true;
     private reloadExternalConfig = true;
     private configuration: WorkspaceConfiguration | undefined = undefined;
@@ -29,11 +29,11 @@ export class ConfigurationManager2 implements IConfigurationManager {
         });
     }
 
-    public static getInstance(): ConfigurationManager2 {
-        if (!ConfigurationManager2.instance) {
-            ConfigurationManager2.instance = new ConfigurationManager2();
+    public static getInstance(): ConfigurationManager {
+        if (!ConfigurationManager.instance) {
+            ConfigurationManager.instance = new ConfigurationManager();
         }
-        return ConfigurationManager2.instance;
+        return ConfigurationManager.instance;
     }
 
     public get(name: string) {