diff --git a/src/Obfuscator.ts b/src/Obfuscator.ts
index 9b308ad2..a5aa7a23 100644
--- a/src/Obfuscator.ts
+++ b/src/Obfuscator.ts
@@ -18,8 +18,8 @@ import { ConsoleOutputNodesGroup } from './node-groups/ConsoleOutputNodesGroup';
 import { DebugProtectionNodesGroup } from './node-groups/DebugProtectionNodesGroup';
 import { DomainLockNodesGroup } from './node-groups/DomainLockNodesGroup';
 import { Node } from './node/Node';
-import { NodeControlFlowTransformersFactory } from './node-transformers/NodeControlFlowTransformersFactory';
-import { NodeObfuscatorsFactory } from './node-transformers/NodeObfuscatorsFactory';
+import { NodeControlFlowTransformersFactory } from './node-transformers/node-control-flow-transformers/factory/NodeControlFlowTransformersFactory';
+import { NodeObfuscatorsFactory } from './node-transformers/node-obfuscators/factory/NodeObfuscatorsFactory';
 import { NodeUtils } from './node/NodeUtils';
 import { SelfDefendingNodesGroup } from './node-groups/SelfDefendingNodesGroup';
 import { StackTraceAnalyzer } from './stack-trace-analyzer/StackTraceAnalyzer';
diff --git a/src/node-transformers/NodeControlFlowTransformersFactory.ts b/src/node-transformers/node-control-flow-transformers/factory/NodeControlFlowTransformersFactory.ts
similarity index 58%
rename from src/node-transformers/NodeControlFlowTransformersFactory.ts
rename to src/node-transformers/node-control-flow-transformers/factory/NodeControlFlowTransformersFactory.ts
index bfd0df1f..61fc9ebd 100644
--- a/src/node-transformers/NodeControlFlowTransformersFactory.ts
+++ b/src/node-transformers/node-control-flow-transformers/factory/NodeControlFlowTransformersFactory.ts
@@ -1,9 +1,9 @@
-import { TNodeTransformer } from '../types/TNodeTransformer';
+import { TNodeTransformer } from '../../../types/TNodeTransformer';
 
-import { NodeType } from '../enums/NodeType';
+import { NodeType } from '../../../enums/NodeType';
 
-import { FunctionControlFlowTransformer } from './node-control-flow-transformers/FunctionControlFlowTransformer';
-import { AbstractNodeTransformersFactory } from './AbstractNodeTransformersFactory';
+import { FunctionControlFlowTransformer } from '../FunctionControlFlowTransformer';
+import { AbstractNodeTransformersFactory } from '../../AbstractNodeTransformersFactory';
 
 export class NodeControlFlowTransformersFactory extends AbstractNodeTransformersFactory {
     /**
diff --git a/src/node-transformers/NodeObfuscatorsFactory.ts b/src/node-transformers/node-obfuscators/factory/NodeObfuscatorsFactory.ts
similarity index 51%
rename from src/node-transformers/NodeObfuscatorsFactory.ts
rename to src/node-transformers/node-obfuscators/factory/NodeObfuscatorsFactory.ts
index 50f25159..60088462 100644
--- a/src/node-transformers/NodeObfuscatorsFactory.ts
+++ b/src/node-transformers/node-obfuscators/factory/NodeObfuscatorsFactory.ts
@@ -1,17 +1,17 @@
-import { TNodeTransformer } from '../types/TNodeTransformer';
+import { TNodeTransformer } from '../../../types/TNodeTransformer';
 
-import { NodeType } from '../enums/NodeType';
+import { NodeType } from '../../../enums/NodeType';
 
-import { CatchClauseObfuscator } from './node-obfuscators/CatchClauseObfuscator';
-import { FunctionDeclarationObfuscator } from './node-obfuscators/FunctionDeclarationObfuscator';
-import { FunctionObfuscator } from './node-obfuscators/FunctionObfuscator';
-import { LabeledStatementObfuscator } from './node-obfuscators/LabeledStatementObfuscator';
-import { LiteralObfuscator } from './node-obfuscators/LiteralObfuscator';
-import { MemberExpressionObfuscator } from './node-obfuscators/MemberExpressionObfuscator';
-import { MethodDefinitionObfuscator } from './node-obfuscators/MethodDefinitionObfuscator';
-import { ObjectExpressionObfuscator } from './node-obfuscators/ObjectExpressionObfuscator';
-import { VariableDeclarationObfuscator } from './node-obfuscators/VariableDeclarationObfuscator';
-import { AbstractNodeTransformersFactory } from './AbstractNodeTransformersFactory';
+import { CatchClauseObfuscator } from '../CatchClauseObfuscator';
+import { FunctionDeclarationObfuscator } from '../FunctionDeclarationObfuscator';
+import { FunctionObfuscator } from '../FunctionObfuscator';
+import { LabeledStatementObfuscator } from '../LabeledStatementObfuscator';
+import { LiteralObfuscator } from '../LiteralObfuscator';
+import { MemberExpressionObfuscator } from '../MemberExpressionObfuscator';
+import { MethodDefinitionObfuscator } from '../MethodDefinitionObfuscator';
+import { ObjectExpressionObfuscator } from '../ObjectExpressionObfuscator';
+import { VariableDeclarationObfuscator } from '../VariableDeclarationObfuscator';
+import { AbstractNodeTransformersFactory } from '../../AbstractNodeTransformersFactory';
 
 export class NodeObfuscatorsFactory extends AbstractNodeTransformersFactory {
     /**