From 088a5cde1a802f6e03b3c360c38e8cb1f8bca25a Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Mon, 8 May 2023 16:42:24 +0200
Subject: [PATCH] RED-6009 - Document Tree Structure * fixed javadoc and
 delombok plugins * removed unused classes * refactored names

---
 redaction-service-v1/pom.xml                  |   32 +-
 .../redaction-service-api-v1/pom.xml          |   19 -
 .../redaction-service-server-v1/pom.xml       |   72 -
 .../controller/RuleBuilderController.java     |    6 +-
 .../adapter/ImageServiceResponseAdapter.java  |   12 +-
 ...ument.java => ClassificationDocument.java} |   10 +-
 ...{Footer.java => ClassificationFooter.java} |    4 +-
 ...{Header.java => ClassificationHeader.java} |    4 +-
 .../{Page.java => ClassificationPage.java}    |    2 +-
 ...ection.java => ClassificationSection.java} |    4 +-
 .../model/image/ClassifiedImage.java          |    7 +-
 .../model/text/SearchableText.java            |   45 +
 .../model/text/SectionText.java               |   64 -
 .../classification/model/text/Text.java       |   18 -
 .../model/text/UnclassifiedText.java          |    1 -
 .../service/BlockificationService.java        |    6 +-
 .../service/BodyTextFrameService.java         |   10 +-
 .../service/ClassificationService.java        |   12 +-
 .../service/PdfSegmentationService.java       |   23 +-
 .../service/SectionsBuilderService.java       |   50 +-
 .../service/TableExtractionService.java       |    4 +-
 .../document/data/DocumentData.java           |    2 +-
 ...ontentsData.java => DocumentTreeData.java} |   10 +-
 .../data/mapper/DocumentDataMapper.java       |   50 +-
 .../data/mapper/DocumentGraphMapper.java      |  116 +-
 .../data/mapper/PropertiesMapper.java         |   26 +-
 .../factory/DocumentGraphFactory.java         |  123 +-
 .../document/factory/SectionNodeFactory.java  |   42 +-
 .../document/factory/TableNodeFactory.java    |   76 +-
 .../document/factory/TextBlockFactory.java    |   14 +-
 ...TableOfContents.java => DocumentTree.java} |   14 +-
 .../document/graph/entity}/EntityType.java    |    2 +-
 .../graph/entity/RedactionEntity.java         |   13 +-
 .../graph/entity/RedactionPosition.java       |    4 +-
 .../{DocumentGraph.java => Document.java}     |   36 +-
 .../nodes/{HeaderNode.java => Footer.java}    |   10 +-
 .../nodes/{FooterNode.java => Header.java}    |   10 +-
 .../{HeadlineNode.java => Headline.java}      |   12 +-
 .../nodes/{ImageNode.java => Image.java}      |   19 +-
 .../document/graph/nodes/ImageType.java       |    9 +
 .../graph/nodes/{PageNode.java => Page.java}  |   10 +-
 .../{ParagraphNode.java => Paragraph.java}    |   10 +-
 .../nodes/{SectionNode.java => Section.java}  |   16 +-
 .../document/graph/nodes/SemanticNode.java    |   73 +-
 .../nodes/{TableNode.java => Table.java}      |   60 +-
 .../{TableCellNode.java => TableCell.java}    |   20 +-
 .../graph/textblock/AtomicTextBlock.java      |    8 +-
 .../textblock/ConcatenatedTextBlock.java      |   11 +-
 .../document/graph/textblock/TextBlock.java   |    8 +-
 .../services/EntityCreationService.java       |   38 +-
 .../ManualRedactionApplicationService.java    |    2 +-
 .../document/utils/RectangleMapper.java       |   15 -
 .../utils/RedactionSearchUtility.java         |   15 +-
 .../queue/RedactionMessageReceiver.java       |    2 +-
 .../redaction/adapter/NerEntitiesAdapter.java |   16 +-
 .../v1/server/redaction/model/CellValue.java  |   53 -
 .../v1/server/redaction/model/Entities.java   |   23 -
 .../v1/server/redaction/model/Entity.java     |  128 --
 .../model/EntityPositionSequence.java         |   26 -
 .../redaction/model/FindEntitiesResult.java   |   20 -
 .../v1/server/redaction/model/Image.java      |   27 -
 .../v1/server/redaction/model/ImageType.java  |    9 -
 .../server/redaction/model/OffsetString.java  |   27 -
 .../server/redaction/model/PageEntities.java  |   28 -
 .../server/redaction/model/ReasonHolder.java  |   16 -
 .../redaction/model/RedRectangle2D.java       |   48 -
 .../redaction/model/SearchableText.java       |  252 ---
 .../v1/server/redaction/model/Section.java    | 1682 -----------------
 .../{ => dictionary}/TenantDictionary.java    |    4 +-
 .../rulebuilder/RuleBuilderModelService.java  |   39 -
 .../service/{analyze => }/AnalyzeService.java |  114 +-
 .../redaction/service/DictionaryService.java  |    2 +-
 .../service/DroolsExecutionService.java       |   33 +-
 .../EntityRedactionService.java               |   19 +-
 ...ManualRedactionSurroundingTextService.java |  120 +-
 .../service/RedactionLogCreatorService.java   |   22 +-
 .../service/RuleBuilderModelService.java      |   22 +
 ...nFinder.java => SectionFinderService.java} |   36 +-
 .../service/SectionGridCreatorService.java    |   29 +-
 .../service/SectionTextBuilderService.java    |  210 --
 .../service/SurroundingWordsService.java      |  138 --
 .../service/entityredaction/EntityFinder.java |  127 --
 .../redaction/utils/EntitySearchUtils.java    |  385 ----
 .../redaction/utils/FindEntityDetails.java    |   28 -
 .../v1/server/redaction/utils/IdBuilder.java  |   37 +-
 .../redaction/utils/OffsetStringUtils.java    |   56 -
 .../storage/RedactionStorageService.java      |   17 +-
 .../server/visualization/service/PdfDraw.java |   20 +-
 .../service/PdfVisualisationService.java      |   14 +-
 .../AbstractRedactionIntegrationTest.java     |    4 +-
 ...> DocumentPerformanceIntegrationTest.java} |   42 +-
 .../HeadlinesGoldStandardIntegrationTest.java |    2 +-
 .../v1/server/RedactionIntegrationTest.java   |   23 +-
 .../redaction/v1/server/RulesTest.java        |    6 +-
 ...java => BuildDocumentIntegrationTest.java} |   16 +-
 ...cumentEntityInsertionIntegrationTest.java} |  132 +-
 ...DocumentGraphTableNodeIntegrationTest.java |   35 -
 ...va => DocumentMappingIntegrationTest.java} |   38 +-
 .../graph/DocumentTableIntegrationTest.java   |   30 +
 ...DocumentVisualizationIntegrationTest.java} |   32 +-
 .../ManualResizeRedactionIntegrationTest.java |   40 +-
 .../realdata/LiveDataIntegrationTest.java     |    7 +
 .../adapter/NerEntitiesAdapterTest.java       |   32 +-
 .../RuleBuilderModelServiceTest.java          |   20 -
 .../utils/EntitySearchUtilsTest.java          |  198 --
 .../PdfSegmentationServiceTest.java           |   62 +-
 .../src/test/resources/drools/allAuthors.drl  |  293 ---
 .../test/resources/drools/entity_rules.drl    |  315 ---
 .../drools/manual_redaction_rules.drl         |   10 +-
 .../resources/drools/merge_entity_rules.drl   |  101 -
 .../src/test/resources/drools/prod_rules.drl  |  383 ----
 .../test/resources/drools/prod_rules_new.drl  |  479 -----
 .../test/resources/drools/prod_syngenta.drl   |    0
 .../resources/drools/prod_syngenta_new.drl    |   84 +-
 .../src/test/resources/drools/rules.drl       |   62 +-
 .../src/test/resources/drools/rules_v2.drl    |    6 +-
 .../src/test/resources/drools/testRules.drl   |  393 ----
 .../EFSA_sanitisation_GFL_v1/rules.drl        |  828 +++++---
 118 files changed, 1636 insertions(+), 7145 deletions(-)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/{Document.java => ClassificationDocument.java} (79%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/{Footer.java => ClassificationFooter.java} (82%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/{Header.java => ClassificationHeader.java} (82%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/{Page.java => ClassificationPage.java} (97%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/{Section.java => ClassificationSection.java} (91%)
 create mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SearchableText.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SectionText.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/Text.java
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/{TableOfContentsData.java => DocumentTreeData.java} (91%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/{TableOfContents.java => DocumentTree.java} (94%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/{redaction/model => layoutparsing/document/graph/entity}/EntityType.java (54%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{DocumentGraph.java => Document.java} (71%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{HeaderNode.java => Footer.java} (82%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{FooterNode.java => Header.java} (82%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{HeadlineNode.java => Headline.java} (80%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{ImageNode.java => Image.java} (79%)
 create mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageType.java
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{PageNode.java => Page.java} (89%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{ParagraphNode.java => Paragraph.java} (81%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{SectionNode.java => Section.java} (78%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{TableNode.java => Table.java} (73%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/{TableCellNode.java => TableCell.java} (79%)
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entities.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/FindEntitiesResult.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ImageType.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/OffsetString.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/PageEntities.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ReasonHolder.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/{ => dictionary}/TenantDictionary.java (80%)
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelService.java
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/{analyze => }/AnalyzeService.java (76%)
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/{entityredaction => }/EntityRedactionService.java (88%)
 create mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RuleBuilderModelService.java
 rename redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/{analyze/SectionFinder.java => SectionFinderService.java} (73%)
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SurroundingWordsService.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityFinder.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/FindEntityDetails.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/OffsetStringUtils.java
 rename redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/{DocumentGraphPerformanceIntegrationTest.java => DocumentPerformanceIntegrationTest.java} (92%)
 rename redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/{BuildDocumentGraphIntegrationTest.java => BuildDocumentIntegrationTest.java} (86%)
 rename redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/{DocumentGraphEntityInsertionIntegrationTest.java => DocumentEntityInsertionIntegrationTest.java} (68%)
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphTableNodeIntegrationTest.java
 rename redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/{DocumentGraphMappingIntegrationTest.java => DocumentMappingIntegrationTest.java} (76%)
 create mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentTableIntegrationTest.java
 rename redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/{DocumentGraphVisualizationIntegrationTest.java => DocumentVisualizationIntegrationTest.java} (64%)
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelServiceTest.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtilsTest.java
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/allAuthors.drl
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/entity_rules.drl
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/merge_entity_rules.drl
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules.drl
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules_new.drl
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta.drl
 delete mode 100644 redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/testRules.drl

diff --git a/redaction-service-v1/pom.xml b/redaction-service-v1/pom.xml
index f52c80d1..7983e6b4 100644
--- a/redaction-service-v1/pom.xml
+++ b/redaction-service-v1/pom.xml
@@ -23,6 +23,7 @@
 
     <properties>
         <pdfbox.version>2.0.24</pdfbox.version>
+        <lombok.version>1.18.26</lombok.version>
     </properties>
 
 
@@ -54,12 +55,10 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.0.2155</version>
                 </plugin>
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>6.3.1</version>
                     <configuration>
                         <format>ALL</format>
                     </configuration>
@@ -67,6 +66,12 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.8</version>
+                    <configuration>
+                        <excludes>
+                            <exclude>org/drools/**/*</exclude>
+                        </excludes>
+                    </configuration>
                     <executions>
                         <execution>
                             <id>prepare-agent</id>
@@ -86,22 +91,21 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok-maven-plugin</artifactId>
+                <version>1.18.20.0</version>
                 <executions>
                     <execution>
-                        <id>prepare-agent</id>
+                        <id>delombok</id>
+                        <phase>generate-sources</phase>
                         <goals>
-                            <goal>prepare-agent</goal>
+                            <goal>delombok</goal>
                         </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report-aggregate</goal>
-                        </goals>
-                        <phase>verify</phase>
+                        <configuration>
+                            <addOutputDirectory>false</addOutputDirectory>
+                            <sourceDirectory>src/main/java</sourceDirectory>
+                            <outputDirectory>${delomboked.sources}</outputDirectory>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml
index 82969479..5009bbf3 100644
--- a/redaction-service-v1/redaction-service-api-v1/pom.xml
+++ b/redaction-service-v1/redaction-service-api-v1/pom.xml
@@ -39,24 +39,5 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml
index 7ecaddfc..32943299 100644
--- a/redaction-service-v1/redaction-service-server-v1/pom.xml
+++ b/redaction-service-v1/redaction-service-server-v1/pom.xml
@@ -132,76 +132,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <!-- generate git.properties for exposure in /info -->
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                        <configuration>
-                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                            <gitDescribe>
-                                <tags>true</tags>
-                            </gitDescribe>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>original-jar</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>original</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <!-- repackages the generated jar into a runnable fat-jar and makes it
-                    executable -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <executable>true</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
index 7e1d5894..1a800e0b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
+import org.springframework.web.bind.annotation.RestController;
+
 import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
 import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
-import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RuleBuilderModelService;
 
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.web.bind.annotation.RestController;
-
 @RestController
 @RequiredArgsConstructor
 public class RuleBuilderController implements RuleBuilderResource {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/ImageServiceResponseAdapter.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/ImageServiceResponseAdapter.java
index 3e543d23..f4eb8b32 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/ImageServiceResponseAdapter.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/ImageServiceResponseAdapter.java
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter;
 
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -11,10 +12,9 @@ import org.springframework.stereotype.Service;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image.ImageServiceResponse;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import lombok.RequiredArgsConstructor;
@@ -41,7 +41,7 @@ public class ImageServiceResponseAdapter {
                     .getLabel()
                     .toUpperCase(Locale.ROOT)) : ImageType.OTHER;
             images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
-                    .add(new ClassifiedImage(new RedRectangle2D(imageMetadata.getPosition().getX1(),
+                    .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
                             imageMetadata.getPosition().getY1(),
                             imageMetadata.getGeometry().getWidth(),
                             imageMetadata.getGeometry().getHeight()), classification, imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber()));
@@ -53,7 +53,7 @@ public class ImageServiceResponseAdapter {
                     .getLabel()
                     .toUpperCase(Locale.ROOT)) : ImageType.OTHER;
             images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
-                    .add(new ClassifiedImage(new RedRectangle2D(imageMetadata.getPosition().getX1(),
+                    .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
                             imageMetadata.getPosition().getY1(),
                             imageMetadata.getGeometry().getWidth(),
                             imageMetadata.getGeometry().getHeight()), classification, imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber()));
@@ -63,7 +63,7 @@ public class ImageServiceResponseAdapter {
     }
 
 
-    public void findOcr(Page page) {
+    public void findOcr(ClassificationPage page) {
 
         page.getImages().forEach(image -> {
             if (image.getImageType().equals(ImageType.OTHER)) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Document.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationDocument.java
similarity index 79%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Document.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationDocument.java
index d5732004..e27faf0e 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Document.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationDocument.java
@@ -13,12 +13,12 @@ import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
-public class Document {
+public class ClassificationDocument {
 
-    private List<Page> pages = new ArrayList<>();
-    private List<Section> sections = new ArrayList<>();
-    private List<Header> headers = new ArrayList<>();
-    private List<Footer> footers = new ArrayList<>();
+    private List<ClassificationPage> pages = new ArrayList<>();
+    private List<ClassificationSection> sections = new ArrayList<>();
+    private List<ClassificationHeader> headers = new ArrayList<>();
+    private List<ClassificationFooter> footers = new ArrayList<>();
     private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
     private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
     private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Footer.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationFooter.java
similarity index 82%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Footer.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationFooter.java
index 676c664c..9eb7b1e9 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Footer.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationFooter.java
@@ -4,14 +4,14 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SearchableText;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
-public class Footer {
+public class ClassificationFooter {
 
     private List<ClassificationTextBlock> textBlocks;
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Header.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationHeader.java
similarity index 82%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Header.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationHeader.java
index 631a70cf..2cb964c1 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Header.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationHeader.java
@@ -4,14 +4,14 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SearchableText;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
-public class Header {
+public class ClassificationHeader {
 
     private List<ClassificationTextBlock> textBlocks;
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Page.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationPage.java
similarity index 97%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Page.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationPage.java
index 76fd8f7d..25ce5b78 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Page.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationPage.java
@@ -13,7 +13,7 @@ import lombok.RequiredArgsConstructor;
 
 @Data
 @RequiredArgsConstructor
-public class Page {
+public class ClassificationPage {
 
     @NonNull
     private List<AbstractPageBlock> textBlocks;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Section.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationSection.java
similarity index 91%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Section.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationSection.java
index 8e46866a..bcbfd4e4 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/Section.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/ClassificationSection.java
@@ -6,14 +6,14 @@ import java.util.List;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SearchableText;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
-public class Section implements Comparable {
+public class ClassificationSection implements Comparable {
 
     private List<AbstractPageBlock> pageBlocks = new ArrayList<>();
     private List<ClassifiedImage> images = new ArrayList<>();
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/image/ClassifiedImage.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/image/ClassifiedImage.java
index 36955df1..c9129e08 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/image/ClassifiedImage.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/image/ClassifiedImage.java
@@ -1,7 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image;
 
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import java.awt.geom.Rectangle2D;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 
 import lombok.Data;
 import lombok.NonNull;
@@ -12,7 +13,7 @@ import lombok.RequiredArgsConstructor;
 public class ClassifiedImage {
 
     @NonNull
-    private RedRectangle2D position;
+    private Rectangle2D position;
     @NonNull
     private ImageType imageType;
     private boolean isAppendedToSection;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SearchableText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SearchableText.java
new file mode 100644
index 00000000..f5144d92
--- /dev/null
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SearchableText.java
@@ -0,0 +1,45 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
+import lombok.Getter;
+
+public class SearchableText {
+
+    @Getter
+    private final List<TextPositionSequence> sequences = new ArrayList<>();
+
+
+    public void add(TextPositionSequence textPositionSequence) {
+
+        sequences.add(textPositionSequence);
+    }
+
+
+    public void addAll(List<TextPositionSequence> textPositionSequences) {
+
+        sequences.addAll(textPositionSequences);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return buildString(sequences);
+    }
+
+
+    public static String buildString(List<TextPositionSequence> sequences) {
+
+        StringBuilder sb = new StringBuilder();
+        for (TextPositionSequence word : sequences) {
+            sb.append(word.toString());
+            sb.append(' ');
+        }
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
+    }
+
+}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SectionText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SectionText.java
deleted file mode 100644
index 8522892c..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SectionText.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea;
-import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SectionText {
-
-    private int sectionNumber;
-    private String text;
-
-    private boolean isTable;
-    private String headline;
-
-    @Builder.Default
-    private List<SectionArea> sectionAreas = new ArrayList<>();
-    @Builder.Default
-    private Set<Image> images = new HashSet<>();
-    @Builder.Default
-    private List<ClassificationTextBlock> textBlocks = new ArrayList<>();
-    @Builder.Default
-    private Map<String, CellValue> tabularData = new HashMap<>();
-    @Builder.Default
-    private List<Integer> cellStarts = new ArrayList<>();
-
-
-    public void setTabularData(Map<String, CellValue> tabularData) {
-
-        tabularData.remove(null);
-        this.tabularData = tabularData;
-    }
-
-
-    @JsonIgnore
-    public SearchableText getSearchableText() {
-
-        SearchableText searchableText = new SearchableText();
-        textBlocks.forEach(block -> {
-            if (block != null) {
-                searchableText.addAll(block.getSequences());
-            }
-        });
-        return searchableText;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/Text.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/Text.java
deleted file mode 100644
index e10e1d14..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/Text.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Text {
-
-    private int numberOfPages;
-    private List<SectionText> sectionTexts = new ArrayList<>();
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/UnclassifiedText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/UnclassifiedText.java
index 6ce3de1e..4616494f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/UnclassifiedText.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/UnclassifiedText.java
@@ -3,7 +3,6 @@ package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.m
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BlockificationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BlockificationService.java
index 84b15272..f4fe3736 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BlockificationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BlockificationService.java
@@ -10,9 +10,9 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.FloatFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Orientation;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Ruling;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.StringFrequencyCounter;
@@ -36,7 +36,7 @@ public class BlockificationService {
      * @param verticalRulingLines   Vertical table lines.
      * @return Page object that contains the Textblock and text statistics.
      */
-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+    public ClassificationPage blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
 
         int indexOnPage = 0;
         List<TextPositionSequence> chunkWords = new ArrayList<>();
@@ -157,7 +157,7 @@ public class BlockificationService {
             previous = block;
         }
 
-        return new Page(chunkBlockList1);
+        return new ClassificationPage(chunkBlockList1);
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BodyTextFrameService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BodyTextFrameService.java
index d4657f5e..bb7e8821 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BodyTextFrameService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/BodyTextFrameService.java
@@ -7,8 +7,8 @@ import org.springframework.stereotype.Service;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.FloatFrequencyCounter;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
@@ -30,7 +30,7 @@ public class BodyTextFrameService {
      * @param bodyTextFrame          frame that contains the main text on portrait pages
      * @param landscapeBodyTextFrame frame that contains the main text on landscape pages
      */
-    public void setBodyTextFrameAdjustedToPage(Page page, Rectangle bodyTextFrame, Rectangle landscapeBodyTextFrame) {
+    public void setBodyTextFrameAdjustedToPage(ClassificationPage page, Rectangle bodyTextFrame, Rectangle landscapeBodyTextFrame) {
 
         Rectangle textFrame = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
 
@@ -65,11 +65,11 @@ public class BodyTextFrameService {
      * @param landscape               Calculate for landscape or portrait
      * @return Rectangle of the text frame
      */
-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+    public Rectangle calculateBodyTextFrame(List<ClassificationPage> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
 
         BodyTextFrameExpansionsRectangle expansionsRectangle = new BodyTextFrameExpansionsRectangle();
 
-        for (Page page : pages) {
+        for (ClassificationPage page : pages) {
 
             if (page.getTextBlocks().isEmpty() || landscape != page.isLandscape()) {
                 continue;
@@ -117,7 +117,7 @@ public class BodyTextFrameService {
     }
 
 
-    private void expandRectangle(ClassificationTextBlock textBlock, Page page, BodyTextFrameExpansionsRectangle expansionsRectangle) {
+    private void expandRectangle(ClassificationTextBlock textBlock, ClassificationPage page, BodyTextFrameExpansionsRectangle expansionsRectangle) {
 
         if (page.getPageWidth() > page.getPageHeight() && page.getRotation() != 0) {
             if (textBlock.getPdfMinY() < expansionsRectangle.minX) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/ClassificationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/ClassificationService.java
index 8ab701f7..f80d786b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/ClassificationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/ClassificationService.java
@@ -7,8 +7,8 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.utils.PositionUtils;
 
@@ -23,7 +23,7 @@ public class ClassificationService {
     private final BodyTextFrameService bodyTextFrameService;
 
 
-    public void classifyDocument(Document document) {
+    public void classifyDocument(ClassificationDocument document) {
 
         Rectangle bodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
         Rectangle landscapeBodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), true);
@@ -31,14 +31,14 @@ public class ClassificationService {
 
         log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());
 
-        for (Page page : document.getPages()) {
+        for (ClassificationPage page : document.getPages()) {
             bodyTextFrameService.setBodyTextFrameAdjustedToPage(page, bodyTextFrame, landscapeBodyTextFrame);
             classifyPage(page, document, headlineFontSizes);
         }
     }
 
 
-    public void classifyPage(Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyPage(ClassificationPage page, ClassificationDocument document, List<Float> headlineFontSizes) {
 
         for (AbstractPageBlock textBlock : page.getTextBlocks()) {
             if (textBlock instanceof ClassificationTextBlock) {
@@ -48,7 +48,7 @@ public class ClassificationService {
     }
 
 
-    public void classifyBlock(ClassificationTextBlock textBlock, Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyBlock(ClassificationTextBlock textBlock, ClassificationPage page, ClassificationDocument document, List<Float> headlineFontSizes) {
 
         var bodyTextFrame = page.getBodyTextFrame();
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/PdfSegmentationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/PdfSegmentationService.java
index 65ade590..52d7cefb 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/PdfSegmentationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/PdfSegmentationService.java
@@ -20,8 +20,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.ad
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.TableServiceResponseAdapter;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table.PdfTableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
@@ -48,7 +48,10 @@ public class PdfSegmentationService {
     private final TableServiceResponseAdapter tableServiceResponseAdapter;
 
 
-    public Document parseDocument(String dossierId, String fileId, InputStream documentInputStream, Map<Integer, List<ClassifiedImage>> pdfImages) throws IOException {
+    public ClassificationDocument parseDocument(String dossierId,
+                                                String fileId,
+                                                InputStream documentInputStream,
+                                                Map<Integer, List<ClassifiedImage>> pdfImages) throws IOException {
 
         PDDocument pdDocument = null;
         File tempFile = null;
@@ -63,8 +66,8 @@ public class PdfSegmentationService {
                 IOUtils.copy(documentInputStream, fos);
 
                 // initialize required variables
-                Document document = new Document();
-                List<Page> pages = new ArrayList<>();
+                ClassificationDocument document = new ClassificationDocument();
+                List<ClassificationPage> pages = new ArrayList<>();
 
                 pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(67108864L));
                 pdDocument.setAllSecurityToBeRemoved(true);
@@ -95,8 +98,8 @@ public class PdfSegmentationService {
     private void processPage(Map<Integer, List<ClassifiedImage>> pdfImages,
                              PDDocument pdDocument,
                              Map<Integer, List<PdfTableCell>> pdfTableCells,
-                             Document document,
-                             List<Page> pages,
+                             ClassificationDocument document,
+                             List<ClassificationPage> pages,
                              int pageNumber) throws IOException {
 
         PDFLinesTextStripper stripper = new PDFLinesTextStripper();
@@ -117,7 +120,7 @@ public class PdfSegmentationService {
                 stripper.getRulings(),
                 stripper.getMinCharWidth(),
                 stripper.getMaxCharHeight());
-        Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
+        ClassificationPage page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
 
         page.setRotation(rotation);
         page.setLandscape(isLandscape);
@@ -139,7 +142,7 @@ public class PdfSegmentationService {
     }
 
 
-    private void increaseDocumentStatistics(Page page, Document document) {
+    private void increaseDocumentStatistics(ClassificationPage page, ClassificationDocument document) {
 
         if (!page.isLandscape()) {
             document.getFontSizeCounter().addAll(page.getFontSizeCounter().getCountPerValue());
@@ -150,7 +153,7 @@ public class PdfSegmentationService {
     }
 
 
-    private void buildPageStatistics(Page page) {
+    private void buildPageStatistics(ClassificationPage page) {
 
         // Collect all statistics for the page, except from blocks inside tables, as tables will always be added to BodyTextFrame.
         for (AbstractPageBlock textBlock : page.getTextBlocks()) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/SectionsBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/SectionsBuilderService.java
index 468b7793..1b33d464 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/SectionsBuilderService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/SectionsBuilderService.java
@@ -11,11 +11,11 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Footer;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Header;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Section;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationFooter;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationHeader;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationSection;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
@@ -28,19 +28,19 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 public class SectionsBuilderService {
 
-    public void buildSections(Document document) {
+    public void buildSections(ClassificationDocument document) {
 
         List<AbstractPageBlock> chunkWords = new ArrayList<>();
-        List<Section> chunkBlockList = new ArrayList<>();
-        List<Header> headers = new ArrayList<>();
-        List<Footer> footers = new ArrayList<>();
+        List<ClassificationSection> chunkBlockList = new ArrayList<>();
+        List<ClassificationHeader> headers = new ArrayList<>();
+        List<ClassificationFooter> footers = new ArrayList<>();
         List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
 
         AbstractPageBlock prev = null;
 
         String lastHeadline = "";
         TablePageBlock previousTable = null;
-        for (Page page : document.getPages()) {
+        for (ClassificationPage page : document.getPages()) {
             List<ClassificationTextBlock> header = new ArrayList<>();
             List<ClassificationTextBlock> footer = new ArrayList<>();
             List<ClassificationTextBlock> unclassifiedText = new ArrayList<>();
@@ -68,7 +68,7 @@ public class SectionsBuilderService {
                 }
 
                 if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
-                    Section chunkBlock = buildTextBlock(chunkWords, lastHeadline);
+                    ClassificationSection chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                     chunkBlock.setHeadline(lastHeadline);
                     if (document.isHeadlines()) {
                         lastHeadline = current.getText();
@@ -89,17 +89,17 @@ public class SectionsBuilderService {
             }
 
             if (!header.isEmpty()) {
-                headers.add(new Header(header));
+                headers.add(new ClassificationHeader(header));
             }
             if (!footer.isEmpty()) {
-                footers.add(new Footer(footer));
+                footers.add(new ClassificationFooter(footer));
             }
             if (!unclassifiedText.isEmpty()) {
                 unclassifiedTexts.add(new UnclassifiedText(unclassifiedText));
             }
         }
 
-        Section chunkBlock = buildTextBlock(chunkWords, lastHeadline);
+        ClassificationSection chunkBlock = buildTextBlock(chunkWords, lastHeadline);
         chunkBlock.setHeadline(lastHeadline);
         chunkBlockList.add(chunkBlock);
 
@@ -110,13 +110,13 @@ public class SectionsBuilderService {
     }
 
 
-    public void addImagesToSections(Document document) {
+    public void addImagesToSections(ClassificationDocument document) {
 
-        Map<Integer, List<Section>> sectionMap = new HashMap<>();
-        for (Section section : document.getSections()) {
+        Map<Integer, List<ClassificationSection>> sectionMap = new HashMap<>();
+        for (ClassificationSection section : document.getSections()) {
             for (AbstractPageBlock container : section.getPageBlocks()) {
 
-                List<Section> sectionsOnPage = sectionMap.computeIfAbsent(container.getPage(), c -> new ArrayList<>());
+                List<ClassificationSection> sectionsOnPage = sectionMap.computeIfAbsent(container.getPage(), c -> new ArrayList<>());
                 if (sectionsOnPage.contains(section)) {
                     continue;
                 }
@@ -125,7 +125,7 @@ public class SectionsBuilderService {
         }
 
         if (sectionMap.isEmpty()) {
-            Section section = new Section();
+            ClassificationSection section = new ClassificationSection();
             document.getSections().add(section);
             sectionMap.computeIfAbsent(1, x -> new ArrayList<>()).add(section);
         }
@@ -133,14 +133,14 @@ public class SectionsBuilderService {
         // first page is always a paragraph, else we can't process pages 1..N,
         // where N is the first found page with a paragraph
         if (sectionMap.get(1) == null) {
-            Section section = new Section();
+            ClassificationSection section = new ClassificationSection();
             document.getSections().add(section);
             sectionMap.computeIfAbsent(1, x -> new ArrayList<>()).add(section);
         }
 
-        for (Page page : document.getPages()) {
+        for (ClassificationPage page : document.getPages()) {
             for (ClassifiedImage image : page.getImages()) {
-                List<Section> sectionsOnPage = sectionMap.get(page.getPageNumber());
+                List<ClassificationSection> sectionsOnPage = sectionMap.get(page.getPageNumber());
                 if (sectionsOnPage == null) {
                     int i = page.getPageNumber();
                     while (sectionsOnPage == null) {
@@ -148,7 +148,7 @@ public class SectionsBuilderService {
                         i--;
                     }
                 }
-                for (Section section : sectionsOnPage) {
+                for (ClassificationSection section : sectionsOnPage) {
                     Float xMin = null;
                     Float yMin = null;
                     Float xMax = null;
@@ -240,9 +240,9 @@ public class SectionsBuilderService {
     }
 
 
-    private Section buildTextBlock(List<AbstractPageBlock> wordBlockList, String lastHeadline) {
+    private ClassificationSection buildTextBlock(List<AbstractPageBlock> wordBlockList, String lastHeadline) {
 
-        Section section = new Section();
+        ClassificationSection section = new ClassificationSection();
 
         for (AbstractPageBlock container : wordBlockList) {
             if (container instanceof TablePageBlock table) {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/TableExtractionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/TableExtractionService.java
index 29aacbfd..9d520e90 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/TableExtractionService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/service/TableExtractionService.java
@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Rectangle;
@@ -79,7 +79,7 @@ public class TableExtractionService {
      * @param cleanRulings The lines used to build the table.
      * @param page         Page object that contains textblocks and statistics.
      */
-    public void extractTables(CleanRulings cleanRulings, Page page) {
+    public void extractTables(CleanRulings cleanRulings, ClassificationPage page) {
 
         List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentData.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentData.java
index 7e8ef978..b960e935 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentData.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentData.java
@@ -15,6 +15,6 @@ public class DocumentData {
     PageData[] pages;
     AtomicTextBlockData[] atomicTextBlocks;
     AtomicPositionBlockData[] atomicPositionBlocks;
-    TableOfContentsData tableOfContents;
+    DocumentTreeData documentTreeData;
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/TableOfContentsData.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentTreeData.java
similarity index 91%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/TableOfContentsData.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentTreeData.java
index aac55f62..61ccb956 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/TableOfContentsData.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/DocumentTreeData.java
@@ -19,7 +19,7 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableOfContentsData {
+public class DocumentTreeData {
 
     EntryData root;
 
@@ -39,7 +39,7 @@ public class TableOfContentsData {
 
     public Stream<EntryData> streamAllEntries() {
 
-        return Stream.concat(Stream.of(root), root.subEntries.stream()).flatMap(TableOfContentsData::flatten);
+        return Stream.concat(Stream.of(root), root.subEntries.stream()).flatMap(DocumentTreeData::flatten);
     }
 
 
@@ -51,7 +51,7 @@ public class TableOfContentsData {
 
     private static Stream<EntryData> flatten(EntryData entry) {
 
-        return Stream.concat(Stream.of(entry), entry.subEntries.stream().flatMap(TableOfContentsData::flatten));
+        return Stream.concat(Stream.of(entry), entry.subEntries.stream().flatMap(DocumentTreeData::flatten));
     }
 
 
@@ -62,7 +62,7 @@ public class TableOfContentsData {
     public static class EntryData {
 
         NodeType type;
-        int[] tocId;
+        int[] treeId;
         Long[] atomicBlocks;
         Long[] pages;
         Map<String, String> properties;
@@ -74,7 +74,7 @@ public class TableOfContentsData {
 
             StringBuilder sb = new StringBuilder();
             sb.append("[");
-            for (int i : tocId) {
+            for (int i : treeId) {
                 sb.append(i);
                 sb.append(",");
             }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentDataMapper.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentDataMapper.java
index d5b3c1a5..ee9b6307 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentDataMapper.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentDataMapper.java
@@ -8,15 +8,15 @@ import java.util.Map;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.AtomicPositionBlockData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.AtomicTextBlockData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentTreeData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.PageData;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.TableOfContentsData;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.AtomicTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 
@@ -25,38 +25,38 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public class DocumentDataMapper {
 
-    public DocumentData toDocumentData(DocumentGraph documentGraph) {
+    public DocumentData toDocumentData(Document document) {
 
-        List<AtomicTextBlockData> atomicTextBlockData = documentGraph.streamTerminalTextBlocksInOrder()
+        List<AtomicTextBlockData> atomicTextBlockData = document.streamTerminalTextBlocksInOrder()
                 .flatMap(textBlock -> textBlock.getAtomicTextBlocks().stream())
                 .distinct()
                 .map(DocumentDataMapper::toAtomicTextBlockData)
                 .toList();
 
-        List<AtomicPositionBlockData> atomicPositionBlockData = documentGraph.streamTerminalTextBlocksInOrder()
+        List<AtomicPositionBlockData> atomicPositionBlockData = document.streamTerminalTextBlocksInOrder()
                 .flatMap(textBlock -> textBlock.getAtomicTextBlocks().stream())
                 .distinct()
                 .map(DocumentDataMapper::toAtomicPositionBlockData)
                 .toList();
 
-        List<PageData> pageData = documentGraph.getPages().stream().map(DocumentDataMapper::toPageData).toList();
-        TableOfContentsData tableOfContentsData = toTableOfContentsData(documentGraph.getTableOfContents());
+        List<PageData> pageData = document.getPages().stream().map(DocumentDataMapper::toPageData).toList();
+        DocumentTreeData documentTreeData = toTableOfContentsData(document.getDocumentTree());
         return DocumentData.builder()
                 .atomicTextBlocks(atomicTextBlockData.toArray(new AtomicTextBlockData[0]))
                 .atomicPositionBlocks(atomicPositionBlockData.toArray(new AtomicPositionBlockData[0]))
                 .pages(pageData.toArray(new PageData[0]))
-                .tableOfContents(tableOfContentsData)
+                .documentTreeData(documentTreeData)
                 .build();
     }
 
 
-    private TableOfContentsData toTableOfContentsData(TableOfContents tableOfContents) {
+    private DocumentTreeData toTableOfContentsData(DocumentTree documentTree) {
 
-        return new TableOfContentsData(toEntryData(tableOfContents.getRoot()));
+        return new DocumentTreeData(toEntryData(documentTree.getRoot()));
     }
 
 
-    private TableOfContentsData.EntryData toEntryData(TableOfContents.Entry entry) {
+    private DocumentTreeData.EntryData toEntryData(DocumentTree.Entry entry) {
 
         Long[] atomicTextBlocks;
 
@@ -67,19 +67,19 @@ public class DocumentDataMapper {
         }
 
         Map<String, String> properties = switch (entry.getType()) {
-            case TABLE -> PropertiesMapper.buildTableProperties((TableNode) entry.getNode());
-            case TABLE_CELL -> PropertiesMapper.buildTableCellProperties((TableCellNode) entry.getNode());
-            case IMAGE -> PropertiesMapper.buildImageProperties((ImageNode) entry.getNode());
-            case SECTION -> PropertiesMapper.buildSectionProperties((SectionNode) entry.getNode());
+            case TABLE -> PropertiesMapper.buildTableProperties((Table) entry.getNode());
+            case TABLE_CELL -> PropertiesMapper.buildTableCellProperties((TableCell) entry.getNode());
+            case IMAGE -> PropertiesMapper.buildImageProperties((Image) entry.getNode());
+            case SECTION -> PropertiesMapper.buildSectionProperties((Section) entry.getNode());
             default -> new HashMap<>();
         };
 
-        return TableOfContentsData.EntryData.builder()
-                .tocId(toPrimitiveIntArray(entry.getTocId()))
+        return DocumentTreeData.EntryData.builder()
+                .treeId(toPrimitiveIntArray(entry.getTocId()))
                 .subEntries(entry.getChildren().stream().map(DocumentDataMapper::toEntryData).toList())
                 .type(entry.getType())
                 .atomicBlocks(atomicTextBlocks)
-                .pages(entry.getNode().getPages().stream().map(PageNode::getNumber).map(Integer::longValue).toArray(Long[]::new))
+                .pages(entry.getNode().getPages().stream().map(Page::getNumber).map(Integer::longValue).toArray(Long[]::new))
                 .properties(properties)
                 .build();
     }
@@ -91,7 +91,7 @@ public class DocumentDataMapper {
     }
 
 
-    private PageData toPageData(PageNode p) {
+    private PageData toPageData(Page p) {
 
         return PageData.builder().rotation(p.getRotation()).height(p.getHeight()).width(p.getWidth()).number(p.getNumber()).build();
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentGraphMapper.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentGraphMapper.java
index 1d374053..74f7fc18 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentGraphMapper.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/DocumentGraphMapper.java
@@ -15,21 +15,21 @@ import com.google.common.primitives.Ints;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.AtomicPositionBlockData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.AtomicTextBlockData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentTreeData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.PageData;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.TableOfContentsData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.FooterNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.HeaderNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.HeadlineNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ParagraphNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Footer;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Header;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Headline;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Paragraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.AtomicTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlockCollector;
@@ -39,11 +39,11 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public class DocumentGraphMapper {
 
-    public DocumentGraph toDocumentGraph(DocumentData documentData) {
+    public Document toDocumentGraph(DocumentData documentData) {
 
-        DocumentGraph documentGraph = new DocumentGraph();
+        Document document = new Document();
         Context context = new Context(documentData,
-                new TableOfContents(documentGraph),
+                new DocumentTree(document),
                 new LinkedList<>(),
                 new LinkedList<>(),
                 Arrays.stream(documentData.getAtomicTextBlocks()).toList(),
@@ -51,24 +51,24 @@ public class DocumentGraphMapper {
 
         context.pages.addAll(Arrays.stream(documentData.getPages()).map(DocumentGraphMapper::buildPage).toList());
 
-        context.tableOfContents.getRoot().getChildren().addAll(buildEntries(documentData.getTableOfContents().getRoot().getSubEntries(), context));
+        context.documentTree.getRoot().getChildren().addAll(buildEntries(documentData.getDocumentTreeData().getRoot().getSubEntries(), context));
 
-        documentGraph.setTableOfContents(context.tableOfContents);
-        documentGraph.setPages(new HashSet<>(context.pages));
-        documentGraph.setNumberOfPages(documentData.getPages().length);
+        document.setDocumentTree(context.documentTree);
+        document.setPages(new HashSet<>(context.pages));
+        document.setNumberOfPages(documentData.getPages().length);
 
-        documentGraph.setTextBlock(documentGraph.buildTextBlock());
-        return documentGraph;
+        document.setTextBlock(document.buildTextBlock());
+        return document;
     }
 
 
-    private List<TableOfContents.Entry> buildEntries(List<TableOfContentsData.EntryData> entries, Context context) {
+    private List<DocumentTree.Entry> buildEntries(List<DocumentTreeData.EntryData> entries, Context context) {
 
-        List<TableOfContents.Entry> newEntries = new LinkedList<>();
-        for (TableOfContentsData.EntryData entryData : entries) {
+        List<DocumentTree.Entry> newEntries = new LinkedList<>();
+        for (DocumentTreeData.EntryData entryData : entries) {
 
             boolean terminal = isTerminal(entryData);
-            List<PageNode> pages = Arrays.stream(entryData.getPages()).map(pageNumber -> getPage(pageNumber, context)).toList();
+            List<Page> pages = Arrays.stream(entryData.getPages()).map(pageNumber -> getPage(pageNumber, context)).toList();
 
             SemanticNode node = switch (entryData.getType()) {
                 case SECTION -> buildSection(context, entryData.getProperties());
@@ -86,83 +86,83 @@ public class DocumentGraphMapper {
                 TextBlock textBlock = toTextBlock(entryData.getAtomicBlocks(), context, node);
                 node.setTerminalTextBlock(textBlock);
             }
-            List<Integer> tocId = Arrays.stream(entryData.getTocId()).boxed().toList();
-            node.setTocId(tocId);
+            List<Integer> tocId = Arrays.stream(entryData.getTreeId()).boxed().toList();
+            node.setTreeId(tocId);
 
             if (entryData.getType() == HEADER) {
-                pages.forEach(page -> page.setHeader((HeaderNode) node));
+                pages.forEach(page -> page.setHeader((Header) node));
             } else if (entryData.getType() == FOOTER) {
-                pages.forEach(page -> page.setFooter((FooterNode) node));
+                pages.forEach(page -> page.setFooter((Footer) node));
             } else {
                 pages.forEach(page -> page.getMainBody().add(node));
             }
-            newEntries.add(TableOfContents.Entry.builder().tocId(tocId).type(entryData.getType()).children(buildEntries(entryData.getSubEntries(), context)).node(node).build());
+            newEntries.add(DocumentTree.Entry.builder().tocId(tocId).type(entryData.getType()).children(buildEntries(entryData.getSubEntries(), context)).node(node).build());
         }
         return newEntries;
     }
 
 
-    private HeadlineNode buildHeadline(Context context, boolean terminal) {
+    private Headline buildHeadline(Context context, boolean terminal) {
 
-        return HeadlineNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
+        return Headline.builder().terminal(terminal).documentTree(context.documentTree()).build();
     }
 
 
-    private static boolean isTerminal(TableOfContentsData.EntryData entryData) {
+    private static boolean isTerminal(DocumentTreeData.EntryData entryData) {
 
         return entryData.getAtomicBlocks().length > 0;
     }
 
 
-    private ImageNode buildImage(Context context, Map<String, String> properties, Long[] pageNumbers) {
+    private Image buildImage(Context context, Map<String, String> properties, Long[] pageNumbers) {
 
         assert pageNumbers.length == 1;
-        PageNode pageNode = getPage(pageNumbers[0], context);
-        var builder = ImageNode.builder();
+        Page page = getPage(pageNumbers[0], context);
+        var builder = Image.builder();
         PropertiesMapper.parseImageProperties(properties, builder);
-        return builder.tableOfContents(context.tableOfContents()).page(pageNode).build();
+        return builder.documentTree(context.documentTree()).page(page).build();
     }
 
 
-    private TableCellNode buildTableCell(Context context, Map<String, String> properties, boolean terminal) {
+    private TableCell buildTableCell(Context context, Map<String, String> properties, boolean terminal) {
 
-        TableCellNode.TableCellNodeBuilder builder = TableCellNode.builder();
+        TableCell.TableCellBuilder builder = TableCell.builder();
         PropertiesMapper.parseTableCellProperties(properties, builder);
-        return builder.terminal(terminal).tableOfContents(context.tableOfContents()).build();
+        return builder.terminal(terminal).documentTree(context.documentTree()).build();
     }
 
 
-    private TableNode buildTable(Context context, Map<String, String> properties) {
+    private Table buildTable(Context context, Map<String, String> properties) {
 
-        TableNode.TableNodeBuilder builder = TableNode.builder();
+        Table.TableBuilder builder = Table.builder();
         PropertiesMapper.parseTableProperties(properties, builder);
-        return builder.tableOfContents(context.tableOfContents()).build();
+        return builder.documentTree(context.documentTree()).build();
     }
 
 
-    private FooterNode buildFooter(Context context, boolean terminal) {
+    private Footer buildFooter(Context context, boolean terminal) {
 
-        return FooterNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
+        return Footer.builder().terminal(terminal).documentTree(context.documentTree()).build();
     }
 
 
-    private HeaderNode buildHeader(Context context, boolean terminal) {
+    private Header buildHeader(Context context, boolean terminal) {
 
-        return HeaderNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
+        return Header.builder().terminal(terminal).documentTree(context.documentTree()).build();
     }
 
 
-    private SectionNode buildSection(Context context, Map<String, String> properties) {
+    private Section buildSection(Context context, Map<String, String> properties) {
 
-        var builder = SectionNode.builder();
+        var builder = Section.builder();
         PropertiesMapper.parseSectionProperties(properties, builder);
-        return builder.tableOfContents(context.tableOfContents()).build();
+        return builder.documentTree(context.documentTree()).build();
     }
 
 
-    private ParagraphNode buildParagraph(Context context, boolean terminal) {
+    private Paragraph buildParagraph(Context context, boolean terminal) {
 
-        return ParagraphNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
+        return Paragraph.builder().terminal(terminal).documentTree(context.documentTree()).build();
     }
 
 
@@ -177,9 +177,9 @@ public class DocumentGraphMapper {
     }
 
 
-    private PageNode buildPage(PageData p) {
+    private Page buildPage(PageData p) {
 
-        return PageNode.builder().rotation(p.getRotation()).height(p.getHeight()).width(p.getWidth()).number(p.getNumber()).mainBody(new LinkedList<>()).build();
+        return Page.builder().rotation(p.getRotation()).height(p.getHeight()).width(p.getWidth()).number(p.getNumber()).mainBody(new LinkedList<>()).build();
     }
 
 
@@ -205,7 +205,7 @@ public class DocumentGraphMapper {
     }
 
 
-    private PageNode getPage(Long pageIndex, Context context) {
+    private Page getPage(Long pageIndex, Context context) {
 
         return context.pages.stream()
                 .filter(page -> page.getNumber() == Math.toIntExact(pageIndex))
@@ -216,9 +216,9 @@ public class DocumentGraphMapper {
 
     record Context(
             DocumentData layoutParsingModel,
-            TableOfContents tableOfContents,
-            List<PageNode> pages,
-            List<SectionNode> sections,
+            DocumentTree documentTree,
+            List<Page> pages,
+            List<Section> sections,
             List<AtomicTextBlockData> atomicTextBlockData,
             List<AtomicPositionBlockData> atomicPositionBlockData) {
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/PropertiesMapper.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/PropertiesMapper.java
index fcc2a55d..6c1fb9ef 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/PropertiesMapper.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/data/mapper/PropertiesMapper.java
@@ -5,16 +5,16 @@ import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.u
 import java.util.HashMap;
 import java.util.Map;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RectangleMapper;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
 
 public class PropertiesMapper {
 
-    public static Map<String, String> buildImageProperties(ImageNode image) {
+    public static Map<String, String> buildImageProperties(Image image) {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("imageType", image.getImageType().toString());
@@ -25,7 +25,7 @@ public class PropertiesMapper {
     }
 
 
-    public static Map<String, String> buildTableCellProperties(TableCellNode tableCell) {
+    public static Map<String, String> buildTableCellProperties(TableCell tableCell) {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("row", String.valueOf(tableCell.getRow()));
@@ -42,7 +42,7 @@ public class PropertiesMapper {
     }
 
 
-    public static Map<String, String> buildTableProperties(TableNode table) {
+    public static Map<String, String> buildTableProperties(Table table) {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("numberOfRows", String.valueOf(table.getNumberOfRows()));
@@ -51,7 +51,7 @@ public class PropertiesMapper {
     }
 
 
-    public static Map<String, String> buildSectionProperties(SectionNode node) {
+    public static Map<String, String> buildSectionProperties(Section node) {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("excludesTables", String.valueOf(node.isExcludesTables()));
@@ -59,7 +59,7 @@ public class PropertiesMapper {
     }
 
 
-    public static void parseImageProperties(Map<String, String> properties, ImageNode.ImageNodeBuilder builder) {
+    public static void parseImageProperties(Map<String, String> properties, Image.ImageBuilder builder) {
 
         builder.imageType(parseImageType(properties.get("imageType")));
         builder.transparent(Boolean.parseBoolean(properties.get("transparency")));
@@ -68,7 +68,7 @@ public class PropertiesMapper {
     }
 
 
-    public static void parseTableCellProperties(Map<String, String> properties, TableCellNode.TableCellNodeBuilder builder) {
+    public static void parseTableCellProperties(Map<String, String> properties, TableCell.TableCellBuilder builder) {
 
         builder.row(Integer.parseInt(properties.get("row")));
         builder.col(Integer.parseInt(properties.get("col")));
@@ -77,14 +77,14 @@ public class PropertiesMapper {
     }
 
 
-    public static void parseTableProperties(Map<String, String> properties, TableNode.TableNodeBuilder builder) {
+    public static void parseTableProperties(Map<String, String> properties, Table.TableBuilder builder) {
 
         builder.numberOfRows(Integer.parseInt(properties.get("numberOfRows")));
         builder.numberOfCols(Integer.parseInt(properties.get("numberOfCols")));
     }
 
 
-    public static void parseSectionProperties(Map<String, String> properties, SectionNode.SectionNodeBuilder builder) {
+    public static void parseSectionProperties(Map<String, String> properties, Section.SectionBuilder builder) {
 
         builder.excludesTables(Boolean.parseBoolean(properties.get("excludesTables")));
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/DocumentGraphFactory.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/DocumentGraphFactory.java
index 49a41047..34a45c20 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/DocumentGraphFactory.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/DocumentGraphFactory.java
@@ -14,25 +14,24 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Footer;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Header;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationFooter;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationHeader;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.FooterNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.HeaderNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.HeadlineNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Footer;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Header;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Headline;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Image;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ParagraphNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Paragraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RectangleMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.TextPositionOperations;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 
@@ -45,11 +44,11 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public class DocumentGraphFactory {
 
-    public DocumentGraph buildDocumentGraph(Document document) {
+    public Document buildDocumentGraph(ClassificationDocument document) {
 
         TextBlockFactory textBlockFactory = new TextBlockFactory();
-        DocumentGraph documentGraph = new DocumentGraph();
-        Context context = new Context(new TableOfContents(documentGraph), new HashMap<>(), new LinkedList<>(), new LinkedList<>(), textBlockFactory);
+        Document documentGraph = new Document();
+        Context context = new Context(new DocumentTree(documentGraph), new HashMap<>(), new LinkedList<>(), new LinkedList<>(), textBlockFactory);
 
         document.getPages().stream().map(DocumentGraphFactory::buildPage).forEach(page -> context.getPages().put(page, new AtomicInteger(1)));
         document.getSections().stream().flatMap(section -> section.getImages().stream()).forEach(image -> context.getImages().add(image));
@@ -58,13 +57,13 @@ public class DocumentGraphFactory {
 
         documentGraph.setNumberOfPages(context.pages.size());
         documentGraph.setPages(context.pages.keySet());
-        documentGraph.setTableOfContents(context.tableOfContents);
+        documentGraph.setDocumentTree(context.documentTree);
         documentGraph.setTextBlock(documentGraph.buildTextBlock());
         return documentGraph;
     }
 
 
-    private void addSections(Document document, Context context) {
+    private void addSections(ClassificationDocument document, Context context) {
 
         document.getSections().forEach(section -> SectionNodeFactory.addSection(null, section.getPageBlocks(), section.getImages(), context));
     }
@@ -78,13 +77,13 @@ public class DocumentGraphFactory {
 
     public void addParagraphOrHeadline(SemanticNode parentNode, ClassificationTextBlock originalTextBlock, Context context, List<ClassificationTextBlock> textBlocksToMerge) {
 
-        PageNode page = context.getPage(originalTextBlock.getPage());
+        Page page = context.getPage(originalTextBlock.getPage());
 
         SemanticNode node;
         if (pageBlockIsHeadline(originalTextBlock)) {
-            node = HeadlineNode.builder().tableOfContents(context.getTableOfContents()).build();
+            node = Headline.builder().documentTree(context.getDocumentTree()).build();
         } else {
-            node = ParagraphNode.builder().tableOfContents(context.getTableOfContents()).build();
+            node = Paragraph.builder().documentTree(context.getDocumentTree()).build();
         }
 
         page.getMainBody().add(node);
@@ -93,49 +92,49 @@ public class DocumentGraphFactory {
         textBlocks.add(originalTextBlock);
         AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks), node, context, page);
 
-        if (node instanceof HeadlineNode headlineNode) {
-            List<Integer> tocId = context.tableOfContents.createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.HEADLINE, node);
-            headlineNode.setTerminalTextBlock(textBlock);
-            headlineNode.setTocId(tocId);
+        if (node instanceof Headline headline) {
+            List<Integer> tocId = context.documentTree.createNewChildEntryAndReturnId(parentNode.getTreeId(), NodeType.HEADLINE, node);
+            headline.setTerminalTextBlock(textBlock);
+            headline.setTreeId(tocId);
         }
-        if (node instanceof ParagraphNode paragraphNode) {
-            List<Integer> tocId = context.tableOfContents.createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.PARAGRAPH, node);
-            paragraphNode.setTerminalTextBlock(textBlock);
-            paragraphNode.setTocId(tocId);
+        if (node instanceof Paragraph paragraph) {
+            List<Integer> tocId = context.documentTree.createNewChildEntryAndReturnId(parentNode.getTreeId(), NodeType.PARAGRAPH, node);
+            paragraph.setTerminalTextBlock(textBlock);
+            paragraph.setTreeId(tocId);
         }
     }
 
 
-    public void addImage(SectionNode sectionNode, ClassifiedImage image, Context context) {
+    public void addImage(Section section, ClassifiedImage image, Context context) {
 
-        Rectangle2D position = RectangleMapper.toRectangle2D(image.getPosition());
-        PageNode page = context.getPage(image.getPage());
-        ImageNode imageNode = ImageNode.builder()
+        Rectangle2D position = image.getPosition();
+        Page page = context.getPage(image.getPage());
+        Image imageNode = Image.builder()
                 .id(IdBuilder.buildId(Set.of(page), List.of(position)))
                 .imageType(image.getImageType())
                 .position(position)
                 .transparent(image.isHasTransparency())
                 .page(page)
-                .tableOfContents(context.getTableOfContents())
+                .documentTree(context.getDocumentTree())
                 .build();
         page.getMainBody().add(imageNode);
 
-        List<Integer> tocId = context.getTableOfContents().createNewChildEntryAndReturnId(sectionNode.getTocId(), NodeType.IMAGE, imageNode);
-        imageNode.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewChildEntryAndReturnId(section.getTreeId(), NodeType.IMAGE, imageNode);
+        imageNode.setTreeId(tocId);
     }
 
 
-    private void addHeaderAndFooterToEachPage(Document document, Context context) {
+    private void addHeaderAndFooterToEachPage(ClassificationDocument document, Context context) {
 
         Map<Integer, List<ClassificationTextBlock>> headers = document.getHeaders()
                 .stream()
-                .map(Header::getTextBlocks)
+                .map(ClassificationHeader::getTextBlocks)
                 .flatMap(List::stream)
                 .collect(groupingBy(AbstractPageBlock::getPage, toList()));
 
         Map<Integer, List<ClassificationTextBlock>> footers = document.getFooters()
                 .stream()
-                .map(Footer::getTextBlocks)
+                .map(ClassificationFooter::getTextBlocks)
                 .flatMap(List::stream)
                 .collect(groupingBy(AbstractPageBlock::getPage, toList()));
 
@@ -159,14 +158,14 @@ public class DocumentGraphFactory {
 
     private void addFooter(List<ClassificationTextBlock> textBlocks, Context context) {
 
-        PageNode page = context.getPage(textBlocks.get(0).getPage());
-        FooterNode footer = FooterNode.builder().tableOfContents(context.getTableOfContents()).build();
+        Page page = context.getPage(textBlocks.get(0).getPage());
+        Footer footer = Footer.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks),
                 footer,
                 context,
                 page);
-        List<Integer> tocId = context.getTableOfContents().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
-        footer.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
+        footer.setTreeId(tocId);
         footer.setTerminalTextBlock(textBlock);
         page.setFooter(footer);
     }
@@ -174,15 +173,15 @@ public class DocumentGraphFactory {
 
     public void addHeader(List<ClassificationTextBlock> textBlocks, Context context) {
 
-        PageNode page = context.getPage(textBlocks.get(0).getPage());
-        HeaderNode header = HeaderNode.builder().tableOfContents(context.getTableOfContents()).build();
+        Page page = context.getPage(textBlocks.get(0).getPage());
+        Header header = Header.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks),
                 header,
                 context,
                 0,
                 page);
-        List<Integer> tocId = context.getTableOfContents().createNewMainEntryAndReturnId(NodeType.HEADER, header);
-        header.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(NodeType.HEADER, header);
+        header.setTreeId(tocId);
         header.setTerminalTextBlock(textBlock);
         page.setHeader(header);
     }
@@ -190,11 +189,11 @@ public class DocumentGraphFactory {
 
     private void addEmptyFooter(int pageIndex, Context context) {
 
-        PageNode page = context.getPage(pageIndex);
-        FooterNode footer = FooterNode.builder().tableOfContents(context.getTableOfContents()).build();
+        Page page = context.getPage(pageIndex);
+        Footer footer = Footer.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.emptyTextBlock(footer, context, page);
-        List<Integer> tocId = context.getTableOfContents().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
-        footer.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
+        footer.setTreeId(tocId);
         footer.setTerminalTextBlock(textBlock);
         page.setFooter(footer);
     }
@@ -202,19 +201,19 @@ public class DocumentGraphFactory {
 
     private void addEmptyHeader(int pageIndex, Context context) {
 
-        PageNode page = context.getPage(pageIndex);
-        HeaderNode header = HeaderNode.builder().tableOfContents(context.getTableOfContents()).build();
+        Page page = context.getPage(pageIndex);
+        Header header = Header.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.emptyTextBlock(header, 0, page);
-        List<Integer> tocId = context.getTableOfContents().createNewMainEntryAndReturnId(NodeType.HEADER, header);
-        header.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(NodeType.HEADER, header);
+        header.setTreeId(tocId);
         header.setTerminalTextBlock(textBlock);
         page.setHeader(header);
     }
 
 
-    private PageNode buildPage(Page p) {
+    private Page buildPage(ClassificationPage p) {
 
-        return PageNode.builder()
+        return Page.builder()
                 .height((int) p.getPageHeight())
                 .width((int) p.getPageWidth())
                 .number(p.getPageNumber())
@@ -229,14 +228,14 @@ public class DocumentGraphFactory {
     @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
     static final class Context {
 
-        TableOfContents tableOfContents;
-        Map<PageNode, AtomicInteger> pages;
-        List<SectionNode> sections;
+        DocumentTree documentTree;
+        Map<Page, AtomicInteger> pages;
+        List<Section> sections;
         List<ClassifiedImage> images;
         TextBlockFactory textBlockFactory;
 
 
-        public PageNode getPage(int pageIndex) {
+        public Page getPage(int pageIndex) {
 
             return pages.keySet()
                     .stream()
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/SectionNodeFactory.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/SectionNodeFactory.java
index d3614b49..7e308dc7 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/SectionNodeFactory.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/SectionNodeFactory.java
@@ -15,8 +15,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.mo
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.TableMergingUtility;
 
@@ -31,30 +31,30 @@ public class SectionNodeFactory {
             return;
         }
         Map<Integer, List<AbstractPageBlock>> blocksPerPage = pageBlocks.stream().collect(groupingBy(AbstractPageBlock::getPage));
-        SectionNode sectionNode = SectionNode.builder().entities(new HashSet<>()).tableOfContents(context.getTableOfContents()).build();
+        Section section = Section.builder().entities(new HashSet<>()).documentTree(context.getDocumentTree()).build();
 
-        context.getSections().add(sectionNode);
-        blocksPerPage.keySet().forEach(pageNumber -> addSectionNodeToPageNode(context, sectionNode, pageNumber));
+        context.getSections().add(section);
+        blocksPerPage.keySet().forEach(pageNumber -> addSectionNodeToPageNode(context, section, pageNumber));
 
         List<Integer> tocId;
         if (parentNode == null) {
-            tocId = context.getTableOfContents().createNewMainEntryAndReturnId(NodeType.SECTION, sectionNode);
+            tocId = context.getDocumentTree().createNewMainEntryAndReturnId(NodeType.SECTION, section);
         } else {
-            tocId = context.getTableOfContents().createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.SECTION, sectionNode);
+            tocId = context.getDocumentTree().createNewChildEntryAndReturnId(parentNode.getTreeId(), NodeType.SECTION, section);
         }
-        sectionNode.setTocId(tocId);
+        section.setTreeId(tocId);
 
-        addFirstHeadlineDirectlyToSection(pageBlocks, context, sectionNode);
+        addFirstHeadlineDirectlyToSection(pageBlocks, context, section);
         if (containsTablesAndTextBlocks(pageBlocks)) {
-            splitPageBlocksIntoSubSections(pageBlocks).forEach(subSectionPageBlocks -> addSection(sectionNode, subSectionPageBlocks, emptyList(), context));
+            splitPageBlocksIntoSubSections(pageBlocks).forEach(subSectionPageBlocks -> addSection(section, subSectionPageBlocks, emptyList(), context));
         } else {
-            addTablesOrParagraphsOrHeadlinesToSection(pageBlocks, context, sectionNode);
+            addTablesOrParagraphsOrHeadlinesToSection(pageBlocks, context, section);
             if (listIsTextBlockOnly(pageBlocks)) {
-                sectionNode.setExcludesTables(true);
+                section.setExcludesTables(true);
             }
         }
 
-        images.stream().distinct().forEach(image -> DocumentGraphFactory.addImage(sectionNode, image, context));
+        images.stream().distinct().forEach(image -> DocumentGraphFactory.addImage(section, image, context));
     }
 
 
@@ -64,16 +64,16 @@ public class SectionNodeFactory {
     }
 
 
-    private void addFirstHeadlineDirectlyToSection(List<AbstractPageBlock> pageBlocks, DocumentGraphFactory.Context context, SectionNode sectionNode) {
+    private void addFirstHeadlineDirectlyToSection(List<AbstractPageBlock> pageBlocks, DocumentGraphFactory.Context context, Section section) {
 
         if (pageBlockIsHeadline(pageBlocks.get(0))) {
-            addTablesOrParagraphsOrHeadlinesToSection(List.of(pageBlocks.get(0)), context, sectionNode);
+            addTablesOrParagraphsOrHeadlinesToSection(List.of(pageBlocks.get(0)), context, section);
             pageBlocks.remove(0);
         }
     }
 
 
-    private void addTablesOrParagraphsOrHeadlinesToSection(List<AbstractPageBlock> pageBlocks, DocumentGraphFactory.Context context, SectionNode sectionNode) {
+    private void addTablesOrParagraphsOrHeadlinesToSection(List<AbstractPageBlock> pageBlocks, DocumentGraphFactory.Context context, Section section) {
 
         Set<AbstractPageBlock> alreadyMerged = new HashSet<>();
         List<AbstractPageBlock> remainingBlocks = new LinkedList<>(pageBlocks);
@@ -88,13 +88,13 @@ public class SectionNodeFactory {
             if (abstractPageBlock instanceof ClassificationTextBlock) {
                 List<ClassificationTextBlock> textBlocks = findTextBlocksWithSameClassificationAndAlignsY(abstractPageBlock, remainingBlocks);
                 alreadyMerged.addAll(textBlocks);
-                DocumentGraphFactory.addParagraphOrHeadline(sectionNode, (ClassificationTextBlock) abstractPageBlock, context, textBlocks);
+                DocumentGraphFactory.addParagraphOrHeadline(section, (ClassificationTextBlock) abstractPageBlock, context, textBlocks);
             }
             if (abstractPageBlock instanceof TablePageBlock tablePageBlock) {
 
                 List<TablePageBlock> tablesToMerge = TableMergingUtility.findConsecutiveTablesWithSameColCountAndSameHeaders(tablePageBlock, remainingBlocks);
                 alreadyMerged.addAll(tablesToMerge);
-                TableNodeFactory.addTable(sectionNode, tablesToMerge, context);
+                TableNodeFactory.addTable(section, tablesToMerge, context);
             }
         }
     }
@@ -181,10 +181,10 @@ public class SectionNodeFactory {
     }
 
 
-    private void addSectionNodeToPageNode(DocumentGraphFactory.Context context, SectionNode sectionNode, Integer pageNumber) {
+    private void addSectionNodeToPageNode(DocumentGraphFactory.Context context, Section section, Integer pageNumber) {
 
-        PageNode page = context.getPage(pageNumber);
-        page.getMainBody().add(sectionNode);
+        Page page = context.getPage(pageNumber);
+        page.getMainBody().add(section);
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TableNodeFactory.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TableNodeFactory.java
index 82f673cc..aeab14ac 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TableNodeFactory.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TableNodeFactory.java
@@ -12,10 +12,10 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.mo
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.TextPositionOperations;
 
 import lombok.experimental.UtilityClass;
@@ -29,17 +29,17 @@ public class TableNodeFactory {
     public void addTable(SemanticNode parentNode, List<TablePageBlock> tablesToMerge, DocumentGraphFactory.Context context) {
 
         setPageNumberInCellTextBlocks(tablesToMerge);
-        Set<PageNode> pages = tablesToMerge.stream().map(AbstractPageBlock::getPage).map(context::getPage).collect(Collectors.toSet());
+        Set<Page> pages = tablesToMerge.stream().map(AbstractPageBlock::getPage).map(context::getPage).collect(Collectors.toSet());
         List<List<Cell>> mergedRows = tablesToMerge.stream().map(TablePageBlock::getRows).flatMap(Collection::stream).toList();
-        TableNode tableNode = TableNode.builder().tableOfContents(context.getTableOfContents()).numberOfCols(mergedRows.get(0).size()).numberOfRows(mergedRows.size()).build();
+        Table table = Table.builder().documentTree(context.getDocumentTree()).numberOfCols(mergedRows.get(0).size()).numberOfRows(mergedRows.size()).build();
 
-        pages.forEach(page -> addTableToPage(page, parentNode, tableNode));
+        pages.forEach(page -> addTableToPage(page, parentNode, table));
 
-        List<Integer> tocId = context.getTableOfContents().createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.TABLE, tableNode);
-        tableNode.setTocId(tocId);
-        addTableCells(mergedRows, tableNode, context);
+        List<Integer> tocId = context.getDocumentTree().createNewChildEntryAndReturnId(parentNode.getTreeId(), NodeType.TABLE, table);
+        table.setTreeId(tocId);
+        addTableCells(mergedRows, table, context);
 
-        IfTableHasNoHeadersAssumeFirstRowAreHeaders(tableNode);
+        IfTableHasNoHeadersAssumeFirstRowAreHeaders(table);
     }
 
 
@@ -53,29 +53,29 @@ public class TableNodeFactory {
     }
 
 
-    private static void addTableToPage(PageNode page, SemanticNode parentNode, TableNode tableNode) {
+    private static void addTableToPage(Page page, SemanticNode parentNode, Table table) {
 
         if (!page.getMainBody().contains(parentNode)) {
             parentNode.getPages().add(page);
         }
 
-        page.getMainBody().add(tableNode);
+        page.getMainBody().add(table);
     }
 
 
-    private static void IfTableHasNoHeadersAssumeFirstRowAreHeaders(TableNode tableNode) {
+    private static void IfTableHasNoHeadersAssumeFirstRowAreHeaders(Table table) {
 
-        if (tableNode.streamHeaders().findAny().isEmpty()) {
-            tableNode.streamRow(0).forEach(tableCellNode -> tableCellNode.setHeader(true));
+        if (table.streamHeaders().findAny().isEmpty()) {
+            table.streamRow(0).forEach(tableCellNode -> tableCellNode.setHeader(true));
         }
     }
 
 
-    private void addTableCells(List<List<Cell>> rows, TableNode tableNode, DocumentGraphFactory.Context context) {
+    private void addTableCells(List<List<Cell>> rows, Table table, DocumentGraphFactory.Context context) {
 
         for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
             for (int colIndex = 0; colIndex < rows.get(rowIndex).size(); colIndex++) {
-                addTableCell(rows.get(rowIndex).get(colIndex), rowIndex, colIndex, tableNode, context);
+                addTableCell(rows.get(rowIndex).get(colIndex), rowIndex, colIndex, table, context);
             }
         }
     }
@@ -84,50 +84,44 @@ public class TableNodeFactory {
     @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD actually flags this wrong
     private void addTableCell(Cell cell, int rowIndex, int colIndex, SemanticNode parentNode, DocumentGraphFactory.Context context) {
 
-        PageNode page = context.getPage(cell.getPageNumber());
+        Page page = context.getPage(cell.getPageNumber());
 
-        TableCellNode tableCellNode = TableCellNode.builder()
-                .tableOfContents(context.getTableOfContents())
-                .row(rowIndex)
-                .col(colIndex)
-                .header(cell.isHeaderCell())
-                .bBox(cell.getBounds2D())
-                .build();
-        page.getMainBody().add(tableCellNode);
+        TableCell tableCell = TableCell.builder().documentTree(context.getDocumentTree()).row(rowIndex).col(colIndex).header(cell.isHeaderCell()).bBox(cell.getBounds2D()).build();
+        page.getMainBody().add(tableCell);
 
         com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock textBlock;
 
-        List<Integer> tocId = context.getTableOfContents().createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.TABLE_CELL, tableCellNode);
-        tableCellNode.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewChildEntryAndReturnId(parentNode.getTreeId(), NodeType.TABLE_CELL, tableCell);
+        tableCell.setTreeId(tocId);
 
         if (cell.getTextBlocks().isEmpty()) {
-            tableCellNode.setTerminalTextBlock(context.getTextBlockFactory().emptyTextBlock(parentNode, context, page));
-            tableCellNode.setTerminal(true);
+            tableCell.setTerminalTextBlock(context.getTextBlockFactory().emptyTextBlock(parentNode, context, page));
+            tableCell.setTerminal(true);
 
         } else if (cell.getTextBlocks().size() == 1) {
-            textBlock = context.getTextBlockFactory().buildAtomicTextBlock(cell.getTextBlocks().get(0).getSequences(), tableCellNode, context, page);
-            tableCellNode.setTerminalTextBlock(textBlock);
-            tableCellNode.setTerminal(true);
+            textBlock = context.getTextBlockFactory().buildAtomicTextBlock(cell.getTextBlocks().get(0).getSequences(), tableCell, context, page);
+            tableCell.setTerminalTextBlock(textBlock);
+            tableCell.setTerminal(true);
 
         } else if (firstTextBlockIsHeadline(cell)) {
-            SectionNodeFactory.addSection(tableCellNode, cell.getTextBlocks().stream().map(tb -> (AbstractPageBlock) tb).toList(), emptyList(), context);
-            tableCellNode.setTerminal(false);
+            SectionNodeFactory.addSection(tableCell, cell.getTextBlocks().stream().map(tb -> (AbstractPageBlock) tb).toList(), emptyList(), context);
+            tableCell.setTerminal(false);
 
         } else if (cellAreaIsSmallerThanPageAreaTimesThreshold(cell, page)) {
             List<TextPositionSequence> sequences = TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(cell.getTextBlocks());
-            textBlock = context.getTextBlockFactory().buildAtomicTextBlock(sequences, tableCellNode, context, page);
-            tableCellNode.setTerminalTextBlock(textBlock);
-            tableCellNode.setTerminal(true);
+            textBlock = context.getTextBlockFactory().buildAtomicTextBlock(sequences, tableCell, context, page);
+            tableCell.setTerminalTextBlock(textBlock);
+            tableCell.setTerminal(true);
 
         } else {
-            cell.getTextBlocks().forEach(tb -> DocumentGraphFactory.addParagraphOrHeadline(tableCellNode, tb, context, emptyList()));
-            tableCellNode.setTerminal(false);
+            cell.getTextBlocks().forEach(tb -> DocumentGraphFactory.addParagraphOrHeadline(tableCell, tb, context, emptyList()));
+            tableCell.setTerminal(false);
         }
 
     }
 
 
-    private static boolean cellAreaIsSmallerThanPageAreaTimesThreshold(Cell cell, PageNode page) {
+    private static boolean cellAreaIsSmallerThanPageAreaTimesThreshold(Cell cell, Page page) {
 
         return cell.getArea() < TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD * page.getHeight() * page.getWidth();
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TextBlockFactory.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TextBlockFactory.java
index 9f96a226..55d31ecb 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TextBlockFactory.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/factory/TextBlockFactory.java
@@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.AtomicTextBlock;
 
@@ -24,18 +24,14 @@ public class TextBlockFactory {
     }
 
 
-    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, DocumentGraphFactory.Context context, PageNode page) {
+    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, DocumentGraphFactory.Context context, Page page) {
 
         Integer numberOnPage = context.getPages().get(page).getAndIncrement();
         return buildAtomicTextBlock(sequences, parent, context, numberOnPage, page);
     }
 
 
-    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences,
-                                                SemanticNode parent,
-                                                DocumentGraphFactory.Context context,
-                                                Integer numberOnPage,
-                                                PageNode page) {
+    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, DocumentGraphFactory.Context context, Integer numberOnPage, Page page) {
 
         SearchTextWithTextPositionDto searchTextWithTextPositionDto = SearchTextWithTextPositionFactory.buildSearchTextToTextPositionModel(sequences);
         int offset = stringOffset.getAndAdd(searchTextWithTextPositionDto.getSearchText().length());
@@ -54,13 +50,13 @@ public class TextBlockFactory {
     }
 
 
-    public AtomicTextBlock emptyTextBlock(SemanticNode parent, DocumentGraphFactory.Context context, PageNode page) {
+    public AtomicTextBlock emptyTextBlock(SemanticNode parent, DocumentGraphFactory.Context context, Page page) {
 
         return emptyTextBlock(parent, context.getPages().get(page).getAndIncrement(), page);
     }
 
 
-    public AtomicTextBlock emptyTextBlock(SemanticNode parent, Integer numberOnPage, PageNode page) {
+    public AtomicTextBlock emptyTextBlock(SemanticNode parent, Integer numberOnPage, Page page) {
 
         return AtomicTextBlock.builder()
                 .id(textBlockIdx.getAndIncrement())
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/TableOfContents.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/DocumentTree.java
similarity index 94%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/TableOfContents.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/DocumentTree.java
index f51276a5..db3f948d 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/TableOfContents.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/DocumentTree.java
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.stream.Stream;
 
 import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
@@ -23,14 +23,14 @@ import lombok.Getter;
 import lombok.experimental.FieldDefaults;
 
 @Data
-public class TableOfContents {
+public class DocumentTree {
 
     private final Entry root;
 
 
-    public TableOfContents(DocumentGraph documentGraph) {
+    public DocumentTree(Document document) {
 
-        root = Entry.builder().tocId(Collections.emptyList()).type(NodeType.DOCUMENT).children(new LinkedList<>()).node(documentGraph).build();
+        root = Entry.builder().tocId(Collections.emptyList()).type(NodeType.DOCUMENT).children(new LinkedList<>()).node(document).build();
     }
 
 
@@ -128,13 +128,13 @@ public class TableOfContents {
 
     public Stream<Entry> streamAllEntriesInOrder() {
 
-        return Stream.of(root).flatMap(TableOfContents::flatten);
+        return Stream.of(root).flatMap(DocumentTree::flatten);
     }
 
 
     public Stream<Entry> streamAllSubEntriesInOrder(List<Integer> parentId) {
 
-        return getEntryById(parentId).children.stream().flatMap(TableOfContents::flatten);
+        return getEntryById(parentId).children.stream().flatMap(DocumentTree::flatten);
     }
 
 
@@ -147,7 +147,7 @@ public class TableOfContents {
 
     private static Stream<Entry> flatten(Entry entry) {
 
-        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(TableOfContents::flatten));
+        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(DocumentTree::flatten));
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityType.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/EntityType.java
similarity index 54%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityType.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/EntityType.java
index 36c171aa..362833e5 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityType.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/EntityType.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity;
 
 public enum EntityType {
     ENTITY,
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionEntity.java
index 05af9bc3..5e4f7472 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionEntity.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionEntity.java
@@ -14,9 +14,8 @@ import java.util.Set;
 import com.google.common.hash.Hashing;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 
 import lombok.AccessLevel;
@@ -56,7 +55,7 @@ public class RedactionEntity {
     String textBefore;
     String textAfter;
     @Builder.Default
-    Set<PageNode> pages = new HashSet<>();
+    Set<Page> pages = new HashSet<>();
     List<RedactionPosition> redactionPositionsPerPage;
     @Builder.Default
     List<SemanticNode> intersectingNodes = new LinkedList<>();
@@ -138,11 +137,11 @@ public class RedactionEntity {
     public List<RedactionPosition> getRedactionPositionsPerPage() {
 
         if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
-            Map<PageNode, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.buildTextBlock().getEntityPositionsPerPage(boundary);
+            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.buildTextBlock().getEntityPositionsPerPage(boundary);
 
-            PageNode firstPage = rectanglesPerLinePerPage.keySet()
+            Page firstPage = rectanglesPerLinePerPage.keySet()
                     .stream()
-                    .min(Comparator.comparingInt(PageNode::getNumber))
+                    .min(Comparator.comparingInt(Page::getNumber))
                     .orElseThrow(() -> new RuntimeException("No Positions found on any page!"));
 
             String id = IdBuilder.buildId(pages, rectanglesPerLinePerPage.values().stream().flatMap(Collection::stream).toList());
@@ -152,7 +151,7 @@ public class RedactionEntity {
     }
 
 
-    private static RedactionPosition buildRedactionPosition(PageNode firstPage, String id, Map.Entry<PageNode, List<Rectangle2D>> entry) {
+    private static RedactionPosition buildRedactionPosition(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
 
         if (entry.getKey().equals(firstPage)) {
             return new RedactionPosition(id, entry.getKey(), entry.getValue());
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionPosition.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionPosition.java
index a869e9eb..211d0d6b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionPosition.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/entity/RedactionPosition.java
@@ -3,7 +3,7 @@ package com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.e
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -16,7 +16,7 @@ import lombok.experimental.FieldDefaults;
 public class RedactionPosition {
 
     final String id;
-    PageNode pageNode;
+    Page page;
     List<Rectangle2D> rectanglePerLine;
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/DocumentGraph.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Document.java
similarity index 71%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/DocumentGraph.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Document.java
index 06bc1fb2..cf776b20 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/DocumentGraph.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Document.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlockCollector;
@@ -28,10 +28,10 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class DocumentGraph implements SemanticNode {
+public class Document implements SemanticNode {
 
-    Set<PageNode> pages;
-    TableOfContents tableOfContents;
+    Set<Page> pages;
+    DocumentTree documentTree;
     Integer numberOfPages;
     TextBlock textBlock;
     @Builder.Default
@@ -44,9 +44,9 @@ public class DocumentGraph implements SemanticNode {
     }
 
 
-    public List<SectionNode> getMainSections() {
+    public List<Section> getMainSections() {
 
-        return streamChildren().filter(node -> node instanceof SectionNode).map(node -> (SectionNode) node).collect(Collectors.toList());
+        return streamChildren().filter(node -> node instanceof Section).map(node -> (Section) node).collect(Collectors.toList());
     }
 
 
@@ -57,24 +57,24 @@ public class DocumentGraph implements SemanticNode {
 
 
     @Override
-    public List<Integer> getTocId() {
+    public List<Integer> getTreeId() {
 
         return Collections.emptyList();
     }
 
 
     @Override
-    public void setTocId(List<Integer> tocId) {
+    public void setTreeId(List<Integer> tocId) {
 
-        throw new UnsupportedOperationException("DocumentGraph is always the root of the TablePageBlock of Contents");
+        throw new UnsupportedOperationException("Document is always the root of the TablePageBlock of Contents");
     }
 
 
     @Override
-    public HeadlineNode getHeadline() {
+    public Headline getHeadline() {
 
-        return streamAllSubNodes().filter(node -> node instanceof HeadlineNode)
-                .map(node -> (HeadlineNode) node)
+        return streamAllSubNodes().filter(node -> node instanceof Headline)
+                .map(node -> (Headline) node)
                 .findFirst()
                 .orElseThrow(() -> new NotFoundException("No Headlines found in this document!"));
     }
@@ -82,13 +82,13 @@ public class DocumentGraph implements SemanticNode {
 
     private Stream<SemanticNode> streamAllNodes() {
 
-        return tableOfContents.streamAllEntriesInOrder().map(TableOfContents.Entry::getNode);
+        return documentTree.streamAllEntriesInOrder().map(DocumentTree.Entry::getNode);
     }
 
 
-    public Stream<ImageNode> streamAllImages() {
+    public Stream<Image> streamAllImages() {
 
-        return streamAllSubNodes().filter(node -> node instanceof ImageNode).map(node -> (ImageNode) node);
+        return streamAllSubNodes().filter(node -> node instanceof Image).map(node -> (Image) node);
     }
 
 
@@ -100,10 +100,10 @@ public class DocumentGraph implements SemanticNode {
 
 
     @Override
-    public Map<PageNode, Rectangle2D> getBBox() {
+    public Map<Page, Rectangle2D> getBBox() {
 
-        Map<PageNode, Rectangle2D> bBox = new HashMap<>();
-        for (PageNode page : pages) {
+        Map<Page, Rectangle2D> bBox = new HashMap<>();
+        for (Page page : pages) {
             bBox.put(page, new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()));
         }
         return bBox;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/HeaderNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Footer.java
similarity index 82%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/HeaderNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Footer.java
index 309dd746..c964da6d 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/HeaderNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Footer.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 
@@ -21,16 +21,16 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class HeaderNode implements SemanticNode {
+public class Footer implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
     TextBlock terminalTextBlock;
 
     @Builder.Default
     boolean terminal = true;
 
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -47,7 +47,7 @@ public class HeaderNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId + ": " + NodeType.HEADER + ": " + terminalTextBlock.buildSummary();
+        return treeId + ": " + NodeType.FOOTER + ": " + terminalTextBlock.buildSummary();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/FooterNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Header.java
similarity index 82%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/FooterNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Header.java
index b741db88..a77f177b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/FooterNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Header.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 
@@ -21,16 +21,16 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class FooterNode implements SemanticNode {
+public class Header implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
     TextBlock terminalTextBlock;
 
     @Builder.Default
     boolean terminal = true;
 
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -47,7 +47,7 @@ public class FooterNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId + ": " + NodeType.FOOTER + ": " + terminalTextBlock.buildSummary();
+        return treeId + ": " + NodeType.HEADER + ": " + terminalTextBlock.buildSummary();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/HeadlineNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Headline.java
similarity index 80%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/HeadlineNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Headline.java
index b2cb28a9..20040e37 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/HeadlineNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Headline.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 
@@ -21,16 +21,16 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class HeadlineNode implements SemanticNode {
+public class Headline implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
     TextBlock terminalTextBlock;
 
     @Builder.Default
     boolean terminal = true;
 
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -47,12 +47,12 @@ public class HeadlineNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId + ": " + NodeType.HEADLINE + ": " + terminalTextBlock.buildSummary();
+        return treeId + ": " + NodeType.HEADLINE + ": " + terminalTextBlock.buildSummary();
     }
 
 
     @Override
-    public HeadlineNode getHeadline() {
+    public Headline getHeadline() {
 
         return this;
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Image.java
similarity index 79%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Image.java
index 99a34362..74970d6f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Image.java
@@ -8,11 +8,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlockCollector;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -27,9 +26,9 @@ import lombok.experimental.FieldDefaults;
 @AllArgsConstructor
 @NoArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class ImageNode implements SemanticNode {
+public class Image implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
     String id;
 
     ImageType imageType;
@@ -46,10 +45,10 @@ public class ImageNode implements SemanticNode {
     int matchedRule = -1;
 
     @EqualsAndHashCode.Exclude
-    PageNode page;
+    Page page;
 
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -64,7 +63,7 @@ public class ImageNode implements SemanticNode {
 
 
     @Override
-    public Set<PageNode> getPages() {
+    public Set<Page> getPages() {
 
         return Collections.singleton(page);
     }
@@ -73,14 +72,14 @@ public class ImageNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId + ": " + NodeType.IMAGE + ": " + imageType.toString() + " " + position;
+        return treeId + ": " + NodeType.IMAGE + ": " + imageType.toString() + " " + position;
     }
 
 
     @Override
-    public Map<PageNode, Rectangle2D> getBBox() {
+    public Map<Page, Rectangle2D> getBBox() {
 
-        Map<PageNode, Rectangle2D> bBoxPerPage = new HashMap<>();
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
         bBoxPerPage.put(page, position);
         return bBoxPerPage;
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageType.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageType.java
new file mode 100644
index 00000000..187a5fe1
--- /dev/null
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ImageType.java
@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes;
+
+public enum ImageType {
+    LOGO,
+    FORMULA,
+    SIGNATURE,
+    OTHER,
+    OCR
+}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/PageNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Page.java
similarity index 89%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/PageNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Page.java
index 8b8b5775..6bf4ba38 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/PageNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Page.java
@@ -21,7 +21,7 @@ import lombok.experimental.FieldDefaults;
 @Builder
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class PageNode {
+public class Page {
 
     Integer number;
     Integer height;
@@ -31,9 +31,9 @@ public class PageNode {
     @EqualsAndHashCode.Exclude
     List<SemanticNode> mainBody;
     @EqualsAndHashCode.Exclude
-    HeaderNode header;
+    Header header;
     @EqualsAndHashCode.Exclude
-    FooterNode footer;
+    Footer footer;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -41,7 +41,7 @@ public class PageNode {
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
-    Set<ImageNode> images = new HashSet<>();
+    Set<Image> images = new HashSet<>();
 
 
     public TextBlock getMainBodyTextBlock() {
@@ -67,7 +67,7 @@ public class PageNode {
     @Override
     public boolean equals(Object o) {
 
-        return o instanceof PageNode && o.hashCode() == this.hashCode();
+        return o instanceof Page && o.hashCode() == this.hashCode();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ParagraphNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Paragraph.java
similarity index 81%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ParagraphNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Paragraph.java
index 08b20227..27efff3b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/ParagraphNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Paragraph.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 
@@ -19,16 +19,16 @@ import lombok.experimental.FieldDefaults;
 @Builder
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class ParagraphNode implements SemanticNode {
+public class Paragraph implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
     TextBlock terminalTextBlock;
 
     @Builder.Default
     boolean terminal = true;
 
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -45,7 +45,7 @@ public class ParagraphNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId + ": " + NodeType.PARAGRAPH + ": " + terminalTextBlock.buildSummary();
+        return treeId + ": " + NodeType.PARAGRAPH + ": " + terminalTextBlock.buildSummary();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SectionNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Section.java
similarity index 78%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SectionNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Section.java
index 5e8a7f99..9149c358 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SectionNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Section.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlockCollector;
@@ -22,13 +22,13 @@ import lombok.extern.slf4j.Slf4j;
 @Builder
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class SectionNode implements SemanticNode {
+public class Section implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
 
     TextBlock textBlock;
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
     boolean excludesTables;
 
     @Builder.Default
@@ -49,15 +49,15 @@ public class SectionNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId.toString() + ": " + NodeType.SECTION + ": " + buildTextBlock().buildSummary();
+        return treeId.toString() + ": " + NodeType.SECTION + ": " + buildTextBlock().buildSummary();
     }
 
 
-    public HeadlineNode getHeadline() {
+    public Headline getHeadline() {
 
         return streamChildren()//
-                .filter(node -> node instanceof HeadlineNode)//
-                .map(node -> (HeadlineNode) node)//
+                .filter(node -> node instanceof Headline)//
+                .map(node -> (Headline) node)//
                 .findFirst()//
                 .orElseGet(() -> getParent().getHeadline());
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SemanticNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SemanticNode.java
index 3070df44..6c82ad20 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SemanticNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/SemanticNode.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.AtomicTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
@@ -20,7 +20,7 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.Re
 public interface SemanticNode {
 
     /**
-     * Searches all Nodes located underneath this Node in the TableOfContents and concatenates their AtomicTextBlocks into a single TextBlockEntity.
+     * Searches all Nodes located underneath this Node in the DocumentTree and concatenates their AtomicTextBlocks into a single TextBlockEntity.
      * So, for a ClassificationSection all TextBlocks of Subsections, Paragraphs, and Tables are concatenated into a single TextBlockEntity
      * If the Node is Terminal, the TerminalTextBlock will be returned instead.
      *
@@ -43,7 +43,7 @@ public interface SemanticNode {
      *
      * @return Set of PageNodes this node appears on.
      */
-    default Set<PageNode> getPages() {
+    default Set<Page> getPages() {
 
         return buildTextBlock().getPages();
     }
@@ -54,7 +54,7 @@ public interface SemanticNode {
      *
      * @return Set of PageNodes this node appears on.
      */
-    default Set<PageNode> getPages(Boundary boundary) {
+    default Set<Page> getPages(Boundary boundary) {
 
         if (!getBoundary().contains(boundary)) {
             throw new IllegalArgumentException(format("%s which was used to query foir pages is not contained in the %s of this node!", getBoundary(), boundary));
@@ -64,17 +64,17 @@ public interface SemanticNode {
 
 
     /**
-     * @return the TableOfContents of the ClassificationDocument this node belongs to
+     * @return the DocumentTree of the ClassificationDocument this node belongs to
      */
-    TableOfContents getTableOfContents();
+    DocumentTree getDocumentTree();
 
 
     /**
-     * The id is a List of Integers uniquely identifying this node in the TableOfContents.
+     * The id is a List of Integers uniquely identifying this node in the DocumentTree.
      *
-     * @return the TableOfContents ID
+     * @return the DocumentTree ID
      */
-    List<Integer> getTocId();
+    List<Integer> getTreeId();
 
 
     /**
@@ -82,37 +82,39 @@ public interface SemanticNode {
      *
      * @param tocId List of Integers
      */
-    void setTocId(List<Integer> tocId);
+    void setTreeId(List<Integer> tocId);
 
 
     /**
-     * Traverses the Tree up, until it hits a HeadlineNode or hits a SectionNode which will then return the first HeadlineNode from its children.
+     * Traverses the Tree up, until it hits a Headline or hits a Section which will then return the first Headline from its children.
      * Throws NotFoundException if no Headline is found this way
      *
-     * @return First HeadlineNode found
+     * @return First Headline found
      */
-    default HeadlineNode getHeadline() {
+    default Headline getHeadline() {
 
         return getParent().getHeadline();
     }
 
 
     /**
-     * @return boolean indicating wether this Node has a Parent in the TableOfContents
+     * Checks if its TocId has a length greater than zero.
+     *
+     * @return boolean indicating whether this Node has a Parent in the DocumentTree
      */
     default boolean hasParent() {
 
-        return getTableOfContents().hasParentById(getTocId());
+        return getDocumentTree().hasParentById(getTreeId());
     }
 
 
     /**
-     * @return The SemanticNode representing the Parent in the TableOfContents
+     * @return The SemanticNode representing the Parent in the DocumentTree
      * throws NotFoundException, when no parent is present
      */
     default SemanticNode getParent() {
 
-        return getTableOfContents().getParentEntryById(getTocId()).getNode();
+        return getDocumentTree().getParentEntryById(getTreeId()).getNode();
     }
 
 
@@ -122,7 +124,7 @@ public interface SemanticNode {
      */
     default SemanticNode getHighestParent() {
 
-        return getTableOfContents().getHighestParentById(getTocId());
+        return getDocumentTree().getHighestParentById(getTreeId());
     }
 
 
@@ -273,24 +275,24 @@ public interface SemanticNode {
 
 
     /**
-     * Streams all children located directly underneath this node in the TableOfContents.
+     * Streams all children located directly underneath this node in the DocumentTree.
      *
      * @return Stream of all children
      */
     default Stream<SemanticNode> streamChildren() {
 
-        return getTableOfContents().streamChildrenNodes(getTocId());
+        return getDocumentTree().streamChildrenNodes(getTreeId());
     }
 
 
     /**
-     * recursively streams all SemanticNodes located underneath this node in the TableOfContents in order.
+     * recursively streams all SemanticNodes located underneath this node in the DocumentTree in order.
      *
      * @return Stream of all SubNodes
      */
     default Stream<SemanticNode> streamAllSubNodes() {
 
-        return getTableOfContents().streamAllSubEntriesInOrder(getTocId()).map(TableOfContents.Entry::getNode);
+        return getDocumentTree().streamAllSubEntriesInOrder(getTreeId()).map(DocumentTree.Entry::getNode);
     }
 
 
@@ -309,9 +311,9 @@ public interface SemanticNode {
      *
      * @return Rectangle2D fully encapsulating this Node for each page.
      */
-    default Map<PageNode, Rectangle2D> getBBox() {
+    default Map<Page, Rectangle2D> getBBox() {
 
-        Map<PageNode, Rectangle2D> bBoxPerPage = new HashMap<>();
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
         if (isTerminal()) {
             return getBBoxFromTerminalTextBlock(bBoxPerPage);
         }
@@ -320,13 +322,30 @@ public interface SemanticNode {
     }
 
 
+    /**
+     * Checks whether the Bounding Box of this SemanticNode contains the provided rectangle on the provided page.
+     *
+     * @param rectangle2D The rectangle to check if it is contained
+     * @param pageNumber  The Page number on which the rectangle should be checked
+     * @return boolean
+     */
+    default boolean containsRectangle(Rectangle2D rectangle2D, Integer pageNumber) {
+
+        Page helperPage = Page.builder().number(pageNumber).build();
+        if (!getPages().contains(helperPage)) {
+            return false;
+        }
+        return getBBox().get(helperPage).contains(rectangle2D);
+    }
+
+
     /**
      * TODO this does not yet work for sections spanning multiple columns.
      *
      * @param bBoxPerPage initial empty BoundingBox
      * @return The union of the BoundingBoxes of all children
      */
-    private Map<PageNode, Rectangle2D> getBBoxFromChildren(Map<PageNode, Rectangle2D> bBoxPerPage) {
+    private Map<Page, Rectangle2D> getBBoxFromChildren(Map<Page, Rectangle2D> bBoxPerPage) {
 
         return streamChildren().map(SemanticNode::getBBox).reduce((map1, map2) -> {
             map1.forEach((page, rectangle) -> map2.merge(page, rectangle, (rect1, rect2) -> rect1.createUnion(rect2).getBounds2D()));
@@ -339,9 +358,9 @@ public interface SemanticNode {
      * @param bBoxPerPage initial empty BoundingBox
      * @return The union of all BoundingBoxes of the ClassificationTextBlock of this node
      */
-    private Map<PageNode, Rectangle2D> getBBoxFromTerminalTextBlock(Map<PageNode, Rectangle2D> bBoxPerPage) {
+    private Map<Page, Rectangle2D> getBBoxFromTerminalTextBlock(Map<Page, Rectangle2D> bBoxPerPage) {
 
-        Map<PageNode, List<AtomicTextBlock>> atomicTextBlockPerPage = buildTextBlock().getAtomicTextBlocks().stream().collect(Collectors.groupingBy(AtomicTextBlock::getPage));
+        Map<Page, List<AtomicTextBlock>> atomicTextBlockPerPage = buildTextBlock().getAtomicTextBlocks().stream().collect(Collectors.groupingBy(AtomicTextBlock::getPage));
         atomicTextBlockPerPage.forEach((page, atbs) -> bBoxPerPage.put(page, RectangleTransformations.bBoxUnionAtomicTextBlock(atbs)));
         return bBoxPerPage;
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Table.java
similarity index 73%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Table.java
index 83685f14..5817d9e4 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/Table.java
@@ -9,7 +9,7 @@ import java.util.Set;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlockCollector;
@@ -25,10 +25,10 @@ import lombok.experimental.FieldDefaults;
 @Builder
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableNode implements SemanticNode {
+public class Table implements SemanticNode {
 
-    List<Integer> tocId;
-    TableOfContents tableOfContents;
+    List<Integer> treeId;
+    DocumentTree documentTree;
 
     int numberOfRows;
     int numberOfCols;
@@ -46,34 +46,32 @@ public class TableNode implements SemanticNode {
                 .boxed()
                 .filter(row -> rowContainsStringsIgnoreCase(row, strings))
                 .flatMap(this::streamRow)
-                .map(TableCellNode::getEntities)
+                .map(TableCell::getEntities)
                 .flatMap(Collection::stream);
     }
 
 
     public boolean rowContainsStringsIgnoreCase(Integer row, List<String> strings) {
 
-        String rowText = streamRow(row).map(TableCellNode::buildTextBlock).collect(new TextBlockCollector()).getSearchText().toLowerCase();
+        String rowText = streamRow(row).map(TableCell::buildTextBlock).collect(new TextBlockCollector()).getSearchText().toLowerCase();
         return strings.stream().map(String::toLowerCase).allMatch(rowText::contains);
     }
 
 
     public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
 
-        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCellNode::getCol).toList();
+        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
         return streamTableCells().filter(tableCellNode -> vertebrateStudyCols.stream()
-                        .anyMatch(vertebrateStudyCol -> getCell(tableCellNode.getRow(), vertebrateStudyCol).containsString(value)))
-                .map(TableCellNode::getEntities)
-                .flatMap(Collection::stream);
+                .anyMatch(vertebrateStudyCol -> getCell(tableCellNode.getRow(), vertebrateStudyCol).containsString(value))).map(TableCell::getEntities).flatMap(Collection::stream);
     }
 
 
     public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
 
-        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCellNode::getCol).toList();
+        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
         return streamTableCells().filter(tableCellNode -> vertebrateStudyCols.stream()
                         .anyMatch(vertebrateStudyCol -> getCell(tableCellNode.getRow(), vertebrateStudyCol).containsAnyString(values)))
-                .map(TableCellNode::getEntities)
+                .map(TableCell::getEntities)
                 .flatMap(Collection::stream);
     }
 
@@ -83,61 +81,61 @@ public class TableNode implements SemanticNode {
         List<Integer> rowsWithEntityOfType = getEntities().stream()
                 .filter(redactionEntity -> types.stream().anyMatch(type -> type.equals(redactionEntity.getType())))
                 .map(RedactionEntity::getIntersectingNodes)
-                .filter(node -> node instanceof TableCellNode)
-                .map(node -> (TableCellNode) node)
-                .map(TableCellNode::getRow)
+                .filter(node -> node instanceof TableCell)
+                .map(node -> (TableCell) node)
+                .map(TableCell::getRow)
                 .toList();
 
-        return rowsWithEntityOfType.stream().flatMap(this::streamRow).map(TableCellNode::getEntities).flatMap(Collection::stream);
+        return rowsWithEntityOfType.stream().flatMap(this::streamRow).map(TableCell::getEntities).flatMap(Collection::stream);
     }
 
 
-    public TableCellNode getCell(int row, int col) {
+    public TableCell getCell(int row, int col) {
 
         if (numberOfRows - row < 0 || numberOfCols - col < 0) {
             throw new IllegalArgumentException(format("row %d, col %d is out of bounds for number of rows of %d and number of cols %d", row, col, numberOfRows, numberOfCols));
         }
         int idx = row * numberOfCols + col;
-        return (TableCellNode) tableOfContents.getEntryById(tocId).getChildren().get(idx).getNode();
+        return (TableCell) documentTree.getEntryById(treeId).getChildren().get(idx).getNode();
     }
 
 
-    public Stream<TableCellNode> streamTableCells() {
+    public Stream<TableCell> streamTableCells() {
 
-        return streamChildren().map(node -> (TableCellNode) node);
+        return streamChildren().map(node -> (TableCell) node);
     }
 
 
-    public Stream<TableCellNode> streamTableCellsWithHeader(String header) {
+    public Stream<TableCell> streamTableCellsWithHeader(String header) {
 
         return streamHeaders().filter(tableCellNode -> tableCellNode.buildTextBlock().getSearchText().contains(header))
-                .map(TableCellNode::getCol)
+                .map(TableCell::getCol)
                 .flatMap(this::streamCol)
                 .filter(tableCellNode -> !tableCellNode.isHeader());
     }
 
 
-    public Stream<TableCellNode> streamCol(int col) {
+    public Stream<TableCell> streamCol(int col) {
 
         return IntStream.range(0, numberOfRows).boxed().map(row -> getCell(row, col));
     }
 
 
-    public Stream<TableCellNode> streamRow(int row) {
+    public Stream<TableCell> streamRow(int row) {
 
         return IntStream.range(0, numberOfCols).boxed().map(col -> getCell(row, col));
     }
 
 
-    public Stream<TableCellNode> streamHeaders() {
+    public Stream<TableCell> streamHeaders() {
 
-        return streamTableCells().filter(TableCellNode::isHeader);
+        return streamTableCells().filter(TableCell::isHeader);
     }
 
 
-    public Stream<TableCellNode> streamHeadersForCell(int row, int col) {
+    public Stream<TableCell> streamHeadersForCell(int row, int col) {
 
-        return Stream.concat(streamRow(row), streamCol(col)).filter(TableCellNode::isHeader);
+        return Stream.concat(streamRow(row), streamCol(col)).filter(TableCell::isHeader);
     }
 
 
@@ -163,8 +161,8 @@ public class TableNode implements SemanticNode {
 
         return redactionEntity.getIntersectingNodes()
                 .stream()
-                .filter(node -> node instanceof TableCellNode)
-                .map(node -> (TableCellNode) node)
+                .filter(node -> node instanceof TableCell)
+                .map(node -> (TableCell) node)
                 .flatMap(tableCellNode -> streamRow(tableCellNode.getRow()))
                 .map(cell -> cell.getEntitiesOfType(type))
                 .flatMap(Collection::stream)
@@ -185,7 +183,7 @@ public class TableNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId.toString() + ": " + NodeType.TABLE + ": #cols: " + numberOfCols + ", #rows: " + numberOfRows + ", " + buildTextBlock().buildSummary();
+        return treeId.toString() + ": " + NodeType.TABLE + ": #cols: " + numberOfCols + ", #rows: " + numberOfRows + ", " + buildTextBlock().buildSummary();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableCellNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableCell.java
similarity index 79%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableCellNode.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableCell.java
index fd7b4f81..5021c18a 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableCellNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableCell.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlockCollector;
@@ -24,9 +24,9 @@ import lombok.experimental.FieldDefaults;
 @Builder
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableCellNode implements SemanticNode {
+public class TableCell implements SemanticNode {
 
-    List<Integer> tocId;
+    List<Integer> treeId;
     int row;
     int col;
     boolean header;
@@ -40,7 +40,7 @@ public class TableCellNode implements SemanticNode {
     TextBlock textBlock;
 
     @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
+    DocumentTree documentTree;
 
     @Builder.Default
     @EqualsAndHashCode.Exclude
@@ -48,9 +48,9 @@ public class TableCellNode implements SemanticNode {
 
 
     @Override
-    public Map<PageNode, Rectangle2D> getBBox() {
+    public Map<Page, Rectangle2D> getBBox() {
 
-        Map<PageNode, Rectangle2D> bBoxPerPage = new HashMap<>();
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
         getPages().forEach(page -> bBoxPerPage.put(page, bBox));
         return bBoxPerPage;
     }
@@ -73,7 +73,7 @@ public class TableCellNode implements SemanticNode {
     @Override
     public String toString() {
 
-        return tocId + ": " + NodeType.TABLE_CELL + ": " + buildTextBlock().buildSummary();
+        return treeId + ": " + NodeType.TABLE_CELL + ": " + buildTextBlock().buildSummary();
     }
 
 
@@ -83,10 +83,10 @@ public class TableCellNode implements SemanticNode {
     }
 
 
-    private Stream<TableCellNode> getHeaders() {
+    private Stream<TableCell> getHeaders() {
 
-        TableNode tableNode = (TableNode) getParent();
-        return tableNode.streamHeadersForCell(row, col);
+        Table table = (Table) getParent();
+        return table.streamHeadersForCell(row, col);
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/AtomicTextBlock.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/AtomicTextBlock.java
index 87523d2b..ece674d8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/AtomicTextBlock.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/AtomicTextBlock.java
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RectangleTransformations;
 
@@ -28,7 +28,7 @@ public class AtomicTextBlock implements TextBlock {
 
     Long id;
     Integer numberOnPage;
-    PageNode page;
+    Page page;
 
     //string coordinates
     Boundary boundary;
@@ -119,14 +119,14 @@ public class AtomicTextBlock implements TextBlock {
     }
 
 
-    public Map<PageNode, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary) {
+    public Map<Page, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary) {
 
         List<Rectangle2D> rectanglesPerLine = stringBoundary.split(getLineBreaks().stream().map(lb -> lb + boundary.start()).filter(stringBoundary::contains).toList())
                 .stream()
                 .map(this::getPositions)
                 .map(RectangleTransformations::rectangleUnion)
                 .toList();
-        Map<PageNode, List<Rectangle2D>> rectanglePerLinePerPage = new HashMap<>();
+        Map<Page, List<Rectangle2D>> rectanglePerLinePerPage = new HashMap<>();
         rectanglePerLinePerPage.put(page, rectanglesPerLine);
         return rectanglePerLinePerPage;
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/ConcatenatedTextBlock.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/ConcatenatedTextBlock.java
index fe353cc0..b64c723a 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/ConcatenatedTextBlock.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/ConcatenatedTextBlock.java
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.stream.Stream;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 
 import lombok.AccessLevel;
 import lombok.Data;
@@ -137,7 +137,7 @@ public class ConcatenatedTextBlock implements TextBlock {
 
 
     @Override
-    public Map<PageNode, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary) {
+    public Map<Page, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary) {
 
         List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
 
@@ -146,8 +146,7 @@ public class ConcatenatedTextBlock implements TextBlock {
         }
 
         AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        Map<PageNode, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getEntityPositionsPerPage(new Boundary(stringBoundary.start(),
-                firstTextBlock.getBoundary().end()));
+        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getEntityPositionsPerPage(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().end()));
 
         for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
             rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getEntityPositionsPerPage(textBlock.getBoundary()));
@@ -160,9 +159,9 @@ public class ConcatenatedTextBlock implements TextBlock {
     }
 
 
-    private Map<PageNode, List<Rectangle2D>> mergeEntityPositionsWithSamePageNode(Map<PageNode, List<Rectangle2D>> map1, Map<PageNode, List<Rectangle2D>> map2) {
+    private Map<Page, List<Rectangle2D>> mergeEntityPositionsWithSamePageNode(Map<Page, List<Rectangle2D>> map1, Map<Page, List<Rectangle2D>> map2) {
 
-        Map<PageNode, List<Rectangle2D>> mergedMap = new HashMap<>(map1);
+        Map<Page, List<Rectangle2D>> mergedMap = new HashMap<>(map1);
         map2.forEach((pageNode, rectangles) -> mergedMap.merge(pageNode, rectangles, (l1, l2) -> Stream.concat(l1.stream(), l2.stream()).toList()));
         return mergedMap;
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/TextBlock.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/TextBlock.java
index 0cbadd90..ded03bb4 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/TextBlock.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/textblock/TextBlock.java
@@ -11,7 +11,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 
 public interface TextBlock extends CharSequence {
 
@@ -39,7 +39,7 @@ public interface TextBlock extends CharSequence {
     List<Rectangle2D> getPositions(Boundary stringBoundary);
 
 
-    Map<PageNode, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary);
+    Map<Page, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary);
 
 
     int numberOfLines();
@@ -51,13 +51,13 @@ public interface TextBlock extends CharSequence {
     }
 
 
-    default Set<PageNode> getPages() {
+    default Set<Page> getPages() {
 
         return getAtomicTextBlocks().stream().map(AtomicTextBlock::getPage).collect(Collectors.toUnmodifiableSet());
     }
 
 
-    default Set<PageNode> getPages(Boundary boundary) {
+    default Set<Page> getPages(Boundary boundary) {
 
         return getAtomicTextBlocks().stream()
                 .filter(atomicTextBlock -> atomicTextBlock.getBoundary().intersects(boundary))
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/EntityCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/EntityCreationService.java
index a4ea20a1..0d9c58c6 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/EntityCreationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/EntityCreationService.java
@@ -20,16 +20,16 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 
@@ -207,19 +207,17 @@ public class EntityCreationService {
     }
 
 
-    public RedactionEntity byTableCellAsHighlight(TableCellNode tableCellNode, String type, EntityType entityType) {
+    public RedactionEntity byTableCellAsHighlight(TableCell tableCell, String type, EntityType entityType) {
 
-        RedactionEntity highlightEntity = RedactionEntity.initialEntityNode(new Boundary(tableCellNode.getBoundary().start(), tableCellNode.getBoundary().start()),
-                type,
-                entityType);
+        RedactionEntity highlightEntity = RedactionEntity.initialEntityNode(new Boundary(tableCell.getBoundary().start(), tableCell.getBoundary().start()), type, entityType);
 
-        String positionId = IdBuilder.buildId(tableCellNode.getBBox().keySet(), tableCellNode.getBBox().values().stream().toList());
-        highlightEntity.setRedactionPositionsPerPage(tableCellNode.getBBox()
+        String positionId = IdBuilder.buildId(tableCell.getBBox().keySet(), tableCell.getBBox().values().stream().toList());
+        highlightEntity.setRedactionPositionsPerPage(tableCell.getBBox()
                 .entrySet()
                 .stream()
                 .map(entry -> new RedactionPosition(positionId, entry.getKey(), List.of(entry.getValue())))
                 .toList());
-        addEntityToGraph(highlightEntity, tableCellNode);
+        addEntityToGraph(highlightEntity, tableCell);
         return highlightEntity;
     }
 
@@ -232,24 +230,24 @@ public class EntityCreationService {
 
     public void addEntityToGraph(RedactionEntity entity, SemanticNode node) {
 
-        TableOfContents tableOfContents = node.getTableOfContents();
+        DocumentTree documentTree = node.getDocumentTree();
         try {
-            addEntityToGraph(entity, tableOfContents);
-            entity.addIntersectingNode(tableOfContents.getRoot().getNode());
-            tableOfContents.getRoot().getNode().getEntities().add(entity);
+            addEntityToGraph(entity, documentTree);
+            entity.addIntersectingNode(documentTree.getRoot().getNode());
+            documentTree.getRoot().getNode().getEntities().add(entity);
         } catch (NoSuchElementException e) {
-            entity.setDeepestFullyContainingNode(tableOfContents.getRoot().getNode());
+            entity.setDeepestFullyContainingNode(documentTree.getRoot().getNode());
             entityEnrichmentService.enrichEntity(entity, entity.getDeepestFullyContainingNode().buildTextBlock());
-            entity.addIntersectingNode(tableOfContents.getRoot().getNode());
+            entity.addIntersectingNode(documentTree.getRoot().getNode());
             addToPages(entity);
             addEntityToNodeEntitySets(entity);
         }
     }
 
 
-    public void addEntityToGraph(RedactionEntity entity, TableOfContents tableOfContents) {
+    public void addEntityToGraph(RedactionEntity entity, DocumentTree documentTree) {
 
-        SemanticNode containingNode = tableOfContents.streamChildrenNodes(Collections.emptyList())
+        SemanticNode containingNode = documentTree.streamChildrenNodes(Collections.emptyList())
                 .filter(node -> node.buildTextBlock().containsBoundary(entity.getBoundary()))
                 .findFirst()
                 .orElseThrow(() -> new NoSuchElementException("No containing Node found!"));
@@ -267,7 +265,7 @@ public class EntityCreationService {
 
     private static void addToPages(RedactionEntity entity) {
 
-        Set<PageNode> pages = entity.getDeepestFullyContainingNode().getPages(entity.getBoundary());
+        Set<Page> pages = entity.getDeepestFullyContainingNode().getPages(entity.getBoundary());
         entity.getPages().addAll(pages);
         pages.forEach(page -> page.getEntities().add(entity));
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/ManualRedactionApplicationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/ManualRedactionApplicationService.java
index 0af0ad40..0a6bc1c0 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/ManualRedactionApplicationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/services/ManualRedactionApplicationService.java
@@ -36,7 +36,7 @@ public class ManualRedactionApplicationService {
             newStartOffset = entityToBeResized.getBoundary().start() + entityToBeResized.getValue().indexOf(manualResizeRedaction.getValue());
         }
 
-        SemanticNode nodeToInsertInto = entityToBeResized.getDeepestFullyContainingNode().getTableOfContents().getRoot().getNode();
+        SemanticNode nodeToInsertInto = entityToBeResized.getDeepestFullyContainingNode().getDocumentTree().getRoot().getNode();
         entityToBeResized.removeFromGraph();
         entityToBeResized.setResized(true);
         entityToBeResized.setRemoved(false);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RectangleMapper.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RectangleMapper.java
index 346d49ae..abd5c492 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RectangleMapper.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RectangleMapper.java
@@ -6,12 +6,9 @@ import java.awt.geom.Rectangle2D;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 
 public class RectangleMapper {
 
@@ -21,12 +18,6 @@ public class RectangleMapper {
     }
 
 
-    public static Rectangle2D toRectangle2D(RedRectangle2D redRectangle2D) {
-
-        return new Rectangle2D.Double(redRectangle2D.getX(), redRectangle2D.getY(), redRectangle2D.getWidth(), redRectangle2D.getHeight());
-    }
-
-
     public static Rectangle2D toRectangle2D(Rectangle redactionLogRectangle) {
 
         return new Rectangle2D.Double(redactionLogRectangle.getTopLeft().getX(),
@@ -36,12 +27,6 @@ public class RectangleMapper {
     }
 
 
-    public static Rectangle2D toRectangle2D(PDRectangle rectangle) {
-
-        return new Rectangle2D.Double(rectangle.getLowerLeftX(), rectangle.getLowerLeftY(), rectangle.getWidth(), rectangle.getHeight());
-    }
-
-
     public static Rectangle toRedactionLogRectangle(Rectangle2D rectangle2D, int pageNumber) {
 
         return new Rectangle(new Point((float) rectangle2D.getMinX(), (float) rectangle2D.getMinY()), (float) rectangle2D.getWidth(), (float) rectangle2D.getHeight(), pageNumber);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RedactionSearchUtility.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RedactionSearchUtility.java
index 0383fc36..b500cdf8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RedactionSearchUtility.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/utils/RedactionSearchUtility.java
@@ -1,18 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils;
 
-import static java.lang.String.format;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+import lombok.experimental.UtilityClass;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-
-import lombok.experimental.UtilityClass;
+import static java.lang.String.format;
 
 @UtilityClass
 public class RedactionSearchUtility {
@@ -72,7 +71,7 @@ public class RedactionSearchUtility {
         }
         return expandedStart;
     }
-    
+
 
     public static List<Boundary> findBoundariesByRegex(String regexPattern, TextBlock textBlock) {
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java
index 97ad034f..11e9ccad 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/RedactionMessageReceiver.java
@@ -14,8 +14,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequ
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.analyze.AnalyzeService;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapter.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapter.java
index bb5fb318..0e964a94 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapter.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapter.java
@@ -12,8 +12,8 @@ import org.springframework.stereotype.Service;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionEntity;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 
 import lombok.AccessLevel;
@@ -38,13 +38,13 @@ public class NerEntitiesAdapter {
      * Adds the appropriate Offsets to the entities from the NER Service.
      *
      * @param nerEntitiesModel the Entities just as the NER Service returns them
-     * @param documentGraph    the document structure, from which the NER Service found the entities
+     * @param document         the document structure, from which the NER Service found the entities
      * @return a stream of validated entities
      */
-    public NerEntities toNerEntities(NerEntitiesModel nerEntitiesModel, DocumentGraph documentGraph) {
+    public NerEntities toNerEntities(NerEntitiesModel nerEntitiesModel, Document document) {
 
-        return new NerEntities(addOffsetsAndFlatten(getStringStartOffsetsForMainSections(documentGraph), nerEntitiesModel).map(nerEntityModel -> new NerEntities.NerEntity(
-                nerEntityModel.getValue(),
+        return new NerEntities(addOffsetsAndFlatten(getStringStartOffsetsForMainSections(document),
+                nerEntitiesModel).map(nerEntityModel -> new NerEntities.NerEntity(nerEntityModel.getValue(),
                 new Boundary(nerEntityModel.getStartOffset(), nerEntityModel.getEndOffset()),
                 nerEntityModel.getType())).toList());
     }
@@ -161,9 +161,9 @@ public class NerEntitiesAdapter {
     }
 
 
-    private static List<Integer> getStringStartOffsetsForMainSections(DocumentGraph documentGraph) {
+    private static List<Integer> getStringStartOffsetsForMainSections(Document document) {
 
-        return documentGraph.getMainSections().stream().map(SectionNode::buildTextBlock).map(TextBlock::getBoundary).map(Boundary::start).toList();
+        return document.getMainSections().stream().map(Section::buildTextBlock).map(TextBlock::getBoundary).map(Boundary::start).toList();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java
deleted file mode 100644
index 8d8b9638..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/CellValue.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class CellValue {
-
-    private List<ClassificationTextBlock> textBlocks = new ArrayList<>();
-
-    private int rowSpanStart;
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder sb = new StringBuilder();
-
-        Iterator<ClassificationTextBlock> itty = textBlocks.iterator();
-        while (itty.hasNext()) {
-            ClassificationTextBlock textBlock = itty.next();
-            TextPositionSequence previous = null;
-            for (TextPositionSequence word : textBlock.getSequences()) {
-                if (previous != null) {
-                    if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
-                        sb.append('\n');
-                    } else {
-                        sb.append(' ');
-                    }
-                }
-                sb.append(word.toString());
-                previous = word;
-            }
-            if (itty.hasNext()) {
-                sb.append(' ');
-            }
-        }
-
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entities.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entities.java
deleted file mode 100644
index de14cbbd..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entities.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Entities {
-
-    @Builder.Default
-    private Set<Entity> entities = new HashSet<>();
-
-    @Builder.Default
-    private Set<Entity> nerEntities = new HashSet<>();
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
deleted file mode 100644
index 2e8a47d8..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Entity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity implements ReasonHolder {
-
-    private String word;
-    private String type;
-    private boolean redaction;
-    private boolean falsePositive;
-    private String redactionReason;
-    private String legalBasis;
-    private List<EntityPositionSequence> positionSequences = new ArrayList<>();
-    private List<TextPositionSequence> targetSequences;
-
-    @EqualsAndHashCode.Include
-    private Integer start;
-    @EqualsAndHashCode.Include
-    private Integer end;
-
-    @EqualsAndHashCode.Include
-    private String headline;
-    private int matchedRule;
-
-    @EqualsAndHashCode.Include
-    private int sectionNumber;
-
-    private boolean isDictionaryEntry;
-
-    private String textBefore;
-    private String textAfter;
-
-    private boolean isDossierDictionaryEntry;
-
-    private boolean ignored;
-
-    private Set<Engine> engines = new HashSet<>();
-
-    private Set<Entity> references = new HashSet<>();
-
-    private EntityType entityType;
-
-    private boolean resized;
-
-    private boolean skipRemoveEntitiesContainedInLarger;
-
-
-    public Entity(String word,
-                  String type,
-                  boolean redaction,
-                  String redactionReason,
-                  List<EntityPositionSequence> positionSequences,
-                  String headline,
-                  int matchedRule,
-                  int sectionNumber,
-                  String legalBasis,
-                  boolean isDictionaryEntry,
-                  String textBefore,
-                  String textAfter,
-                  Integer start,
-                  Integer end,
-                  boolean isDossierDictionaryEntry,
-                  Set<Engine> engines,
-                  Set<Entity> references,
-                  EntityType entityType) {
-
-        this.word = word;
-        this.type = type;
-        this.redaction = redaction;
-        this.redactionReason = redactionReason;
-        this.positionSequences = positionSequences;
-        this.headline = headline;
-        this.matchedRule = matchedRule;
-        this.sectionNumber = sectionNumber;
-        this.legalBasis = legalBasis;
-        this.isDictionaryEntry = isDictionaryEntry;
-        this.textBefore = textBefore;
-        this.textAfter = textAfter;
-        this.start = start;
-        this.end = end;
-        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
-        this.engines = engines;
-        this.references = references;
-        this.entityType = entityType;
-    }
-
-
-    public Entity(String word,
-                  String type,
-                  Integer start,
-                  Integer end,
-                  String headline,
-                  int sectionNumber,
-                  boolean isDictionaryEntry,
-                  boolean isDossierDictionaryEntry,
-                  Engine engine,
-                  EntityType entityType) {
-
-        this.word = word;
-        this.type = type;
-        this.start = start;
-        this.end = end;
-        this.headline = headline;
-        this.sectionNumber = sectionNumber;
-        this.isDictionaryEntry = isDictionaryEntry;
-        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
-        this.engines.add(engine);
-        this.entityType = entityType;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java
deleted file mode 100644
index 4aa96054..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/EntityPositionSequence.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@Builder
-@RequiredArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode
-public class EntityPositionSequence {
-
-    private final String id;
-    @EqualsAndHashCode.Exclude
-    private List<TextPositionSequence> sequences = new ArrayList<>();
-    private int pageNumber;
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/FindEntitiesResult.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/FindEntitiesResult.java
deleted file mode 100644
index 8defe555..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/FindEntitiesResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class FindEntitiesResult {
-
-    private Set<Entity> entities;
-    private Set<FileAttribute> addedFileAttributes;
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java
deleted file mode 100644
index 2f8adb1c..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Image.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Image implements ReasonHolder {
-
-    private String type;
-    private RedRectangle2D position;
-    private boolean redaction;
-    private String redactionReason;
-    private String legalBasis;
-    private int matchedRule;
-    private int sectionNumber;
-    private String section;
-    private int page;
-    private boolean ignored;
-    private boolean hasTransparency;
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ImageType.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ImageType.java
deleted file mode 100644
index d47536ae..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ImageType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-public enum ImageType {
-    LOGO,
-    FORMULA,
-    SIGNATURE,
-    OTHER,
-    OCR
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/OffsetString.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/OffsetString.java
deleted file mode 100644
index 4c12fe9a..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/OffsetString.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class OffsetString {
-
-    private String value;
-    private int start;
-    private int end;
-
-
-    public OffsetString trim() {
-
-        String trimmed = this.value.trim();
-        int indexInUntrimmed = this.value.indexOf(trimmed);
-
-        int newStart = this.start + indexInUntrimmed;
-        int newEnd = newStart + trimmed.length();
-
-        return new OffsetString(trimmed, newStart, newEnd);
-    }
-
-}
-
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/PageEntities.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/PageEntities.java
deleted file mode 100644
index 2e433573..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/PageEntities.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class PageEntities {
-
-    @Builder.Default
-    private Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-
-    @Builder.Default
-    private Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
-
-    @Builder.Default
-    private Set<FileAttribute> addedFileAttributes = new HashSet<>();
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ReasonHolder.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ReasonHolder.java
deleted file mode 100644
index d9278f55..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/ReasonHolder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-public interface ReasonHolder {
-
-    String getRedactionReason();
-
-
-    void setRedactionReason(String reason);
-
-
-    boolean isRedaction();
-
-
-    void setRedaction(boolean value);
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java
deleted file mode 100644
index df648776..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/RedRectangle2D.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedRectangle2D {
-
-    public static final double THRESHOLD = 0.01;
-
-    private double x;
-    private double y;
-    private double width;
-    private double height;
-
-
-    @JsonIgnore
-    public boolean isEmpty() {
-
-        return width <= 0.0f || height <= 0.0f;
-    }
-
-
-    public boolean contains(double x, double y, double w, double h) {
-
-        if (isEmpty() || w <= 0 || h <= 0) {
-            return false;
-        }
-        double x0 = getX();
-        double y0 = getY();
-        return round(x) >= round(x0) && round(y) >= round(y0) && (x + w) - (x0 + getWidth()) <= THRESHOLD && (y + h) - (y0 + getHeight()) <= THRESHOLD;
-    }
-
-
-    private double round(double value) {
-
-        double d = Math.pow(10, 2);
-        return Math.round(value * d) / d;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java
deleted file mode 100644
index bea6fc2d..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/SearchableText.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-
-import lombok.Getter;
-
-public class SearchableText {
-
-    @JsonIgnore
-    private transient String stringRepresentation;
-    @Getter
-    private final List<TextPositionSequence> sequences = new ArrayList<>();
-
-
-    public void add(TextPositionSequence textPositionSequence) {
-
-        sequences.add(textPositionSequence);
-    }
-
-
-    public void addAll(List<TextPositionSequence> textPositionSequences) {
-
-        sequences.addAll(textPositionSequences);
-    }
-
-
-    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive) {
-
-        return getSequences(searchString, caseInsensitive, null);
-
-    }
-
-
-    @SuppressWarnings("checkstyle:ModifiedControlVariable")
-    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive, List<TextPositionSequence> sequencesSubList) {
-
-        String normalizedSearchString;
-        if (caseInsensitive) {
-            normalizedSearchString = searchString.toLowerCase();
-        } else {
-            normalizedSearchString = searchString;
-        }
-
-        char[] searchChars = normalizedSearchString.replaceAll("\\n", " ").toCharArray();
-        int counter = 0;
-
-        List<TextPositionSequence> crossSequenceParts = new ArrayList<>();
-        List<EntityPositionSequence> finalMatches = new ArrayList<>();
-
-        List<TextPositionSequence> searchSpace;
-        if (sequencesSubList != null) {
-            int subListIndex = Collections.indexOfSubList(sequences, sequencesSubList);
-            if (subListIndex != -1) {
-                searchSpace = sequences.subList(subListIndex, subListIndex + sequencesSubList.size());
-            } else {
-                searchSpace = sequences;
-            }
-        } else {
-            searchSpace = sequences;
-        }
-
-        for (int i = 0; i < searchSpace.size(); i++) {
-            TextPositionSequence partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
-            for (int j = 0; j < searchSpace.get(i).length(); j++) {
-
-                if (i > 0 && j == 0 && searchSpace.get(i).charAt(0, caseInsensitive) == ' ' && searchSpace.get(i - 1)
-                        .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i).charAt(j, caseInsensitive) == ' ' && searchSpace.get(i)
-                        .charAt(j - 1, caseInsensitive) == ' ') {
-                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions().isEmpty()) {
-                        crossSequenceParts.add(partMatch);
-                    }
-                    continue;
-                }
-
-                if (j == 0 && searchSpace.get(i).charAt(j, caseInsensitive) != ' ' && i != 0 && searchSpace.get(i - 1)
-                        .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchChars[counter] == ' ') {
-                    counter++;
-                }
-
-                if (searchSpace.get(i).charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace.get(i).charAt(j, caseInsensitive) == '-') {
-
-                    if (counter != 0 || i == 0 && j == 0 || j != 0 && (SeparatorUtils.isSeparator(searchSpace.get(i).charAt(j - 1, caseInsensitive)) || SeparatorUtils.isSeparator(
-                            searchSpace.get(i).charAt(j, caseInsensitive))) || j == 0 && i != 0 && SeparatorUtils.isSeparator(searchSpace.get(i - 1)
-                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive)) || j == 0 && i != 0 && searchSpace.get(i - 1)
-                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchSpace.get(i).charAt(j, caseInsensitive) != ' ') {
-                        partMatch.add(searchSpace.get(i), searchSpace.get(i).textPositionAt(j));
-                        if (!(j == searchSpace.get(i).length() - 1 && searchSpace.get(i).charAt(j, caseInsensitive) == '-' && searchChars[counter] != '-')) {
-                            counter++;
-                        }
-                    }
-
-                    if (counter == searchString.length()) {
-                        crossSequenceParts.add(partMatch);
-
-                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i).length() - 1 || j != searchSpace.get(i)
-                                .length() - 1 && (SeparatorUtils.isSeparator(searchSpace.get(i).charAt(j + 1, caseInsensitive)) || SeparatorUtils.isSeparator(searchSpace.get(i)
-                                .charAt(j, caseInsensitive))) || j == searchSpace.get(i).length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i + 1)
-                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
-                                .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1).charAt(0, caseInsensitive) != ' ') {
-                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts, normalizedSearchString));
-                        }
-
-                        counter = 0;
-                        crossSequenceParts = new ArrayList<>();
-                        partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
-                    }
-                } else {
-                    counter = 0;
-                    if (!crossSequenceParts.isEmpty()) {
-                        j = j - partMatch.length() - 1;
-                    }
-                    crossSequenceParts = new ArrayList<>();
-                    partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
-                }
-
-                if (j == searchSpace.get(i).length() - 1 && counter != 0) {
-                    crossSequenceParts.add(partMatch);
-                }
-            }
-        }
-
-        return finalMatches;
-    }
-
-
-    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts, String searchString) {
-
-        List<EntityPositionSequence> result = new ArrayList<>();
-        String asString = buildString(crossSequenceParts);
-        if (!asString.equalsIgnoreCase(searchString)) {
-            return result;
-        }
-
-        String plainId = IdBuilder.buildId(crossSequenceParts);
-        String id = plainId;
-
-        int currentPage = -1;
-        int idDiffentPageSuffix = 1;
-        EntityPositionSequence entityPositionSequence = new EntityPositionSequence(id);
-        for (TextPositionSequence textPositionSequence : crossSequenceParts) {
-            if (currentPage == -1) {
-                currentPage = textPositionSequence.getPage();
-                entityPositionSequence.setPageNumber(currentPage);
-                entityPositionSequence.getSequences().add(textPositionSequence);
-            } else if (currentPage == textPositionSequence.getPage()) {
-                entityPositionSequence.getSequences().add(textPositionSequence);
-            } else {
-                id = plainId + "-" + idDiffentPageSuffix;
-                idDiffentPageSuffix++;
-                result.add(entityPositionSequence);
-                entityPositionSequence = new EntityPositionSequence(id);
-                entityPositionSequence.setPageNumber(textPositionSequence.getPage());
-                entityPositionSequence.getSequences().add(textPositionSequence);
-                currentPage = textPositionSequence.getPage();
-            }
-        }
-        result.add(entityPositionSequence);
-        return result;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return buildString(sequences);
-    }
-
-
-    public String asString() {
-
-        if (stringRepresentation == null) {
-            stringRepresentation = buildString(sequences);
-        }
-        return stringRepresentation;
-    }
-
-
-    public static String buildString(List<TextPositionSequence> sequences) {
-
-        StringBuilder sb = new StringBuilder();
-        for (TextPositionSequence word : sequences) {
-            sb.append(word.toString());
-            sb.append(' ');
-        }
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
-    }
-
-
-    public String getAsStringWithLinebreaksSorted() {
-
-        return getAsStringWithLinebreaksSorted(this.sequences);
-    }
-
-
-    public String getAsStringWithLinebreaksSorted(List<TextPositionSequence> sequences) {
-
-        var sorted = sequences.stream()
-                .sorted(Comparator.comparing(a -> a.getTextPositions().get(0).getXDirAdj()))
-                .sorted(Comparator.comparing(a -> a.getTextPositions().get(0).getYDirAdj()))
-                .sorted(Comparator.comparing(a -> a.getPage()))
-                .collect(Collectors.toList());
-
-        StringBuilder sb = new StringBuilder();
-
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sorted) {
-
-            if (previous != null) {
-                if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
-                }
-            }
-            sb.append(word.toString());
-            previous = word;
-        }
-        return sb.append("\n").toString();
-    }
-
-
-    public String getAsStringWithLinebreaks() {
-
-        StringBuilder sb = new StringBuilder();
-
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sequences) {
-
-            if (previous != null) {
-                if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
-                }
-            }
-            sb.append(word.toString());
-            previous = word;
-        }
-        return sb.append("\n").toString();
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
deleted file mode 100644
index cc6649cf..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java
+++ /dev/null
@@ -1,1682 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea;
-import com.iqser.red.service.redaction.v1.model.ArgumentType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.RedTextPosition;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.OffsetStringUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-@Data
-@Slf4j
-@Builder
-public class Section {
-
-    private boolean isLocal;
-
-    private Set<String> dictionaryTypes;
-
-    @Builder.Default
-    private Map<String, Set<String>> localDictionaryAdds = new HashMap<>();
-
-    private Set<Entity> entities;
-
-    private Set<Entity> nerEntities;
-
-    // This still contains linebreaks etc.
-    private String text;
-
-    //This does not contain linebreaks and must always be used for correct offsets.
-    private String searchText;
-
-    private String headline;
-
-    private int sectionNumber;
-
-    private Map<String, CellValue> tabularData;
-
-    private Dictionary dictionary;
-
-    private SearchableText searchableText;
-
-    @Builder.Default
-    private Set<Image> images = new HashSet<>();
-
-    @Builder.Default
-    private List<FileAttribute> fileAttributes = new ArrayList<>();
-
-    @Builder.Default
-    private Set<FileAttribute> addedFileAttributes = new HashSet<>();
-
-    @Builder.Default
-    private List<SectionArea> sectionAreas = new ArrayList<>();
-
-    private ManualRedactions manualRedactions;
-
-    private boolean isInTable;
-
-
-    @Deprecated
-    @SuppressWarnings("unused")
-    @ThenAction
-    public void addAiEntities(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.TYPE) String asType) {
-
-        redactOrRecommendAiEntities(type, asType, false, 0, null, null);
-    }
-
-
-    @SuppressWarnings("unused")
-    @ThenAction
-    public void recommendAiEntities(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.TYPE) String asType) {
-
-        redactOrRecommendAiEntities(type, asType, false, 0, null, null);
-    }
-
-
-    @SuppressWarnings("unused")
-    @ThenAction
-    public void redactAiEntities(@Argument(ArgumentType.TYPE) String type,
-                                 @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                 @Argument(ArgumentType.STRING) String reason,
-                                 @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactOrRecommendAiEntities(type, asType, true, ruleNumber, reason, legalBasis);
-    }
-
-
-    @SuppressWarnings("unused")
-    @ThenAction
-    public void combineAiTypes(@Argument(ArgumentType.TYPE) String startType,
-                               @Argument(ArgumentType.TYPE) String combineTypes,
-                               @Argument(ArgumentType.INTEGER) int maxDistanceBetween,
-                               @Argument(ArgumentType.TYPE) String asType,
-                               @Argument(ArgumentType.INTEGER) int minPartMatches,
-                               @Argument(ArgumentType.BOOLEAN) boolean allowDuplicateTypes) {
-
-        Set<String> combineSet = Set.of(combineTypes.split(","));
-
-        List<Entity> sorted = nerEntities.stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
-        Set<Entity> found = new HashSet<>();
-        int start = -1;
-        int lastEnd = -1;
-        int numberOfMatchParts = 0;
-        Set<String> foundParts = new HashSet<>();
-        for (Entity entity : sorted) {
-            if (entity.getType().equals(startType) && start == -1) {
-                lastEnd = entity.getEnd();
-                start = entity.getStart();
-                foundParts.add(entity.getType());
-                numberOfMatchParts++;
-            } else if (!allowDuplicateTypes && foundParts.contains(entity.getType())) {
-                if (numberOfMatchParts >= minPartMatches) {
-                    String value = searchText.substring(start, lastEnd);
-                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER, true));
-                }
-                start = -1;
-                lastEnd = -1;
-                numberOfMatchParts = 0;
-                foundParts = new HashSet<>();
-                if (entity.getType().equals(startType)) {
-                    lastEnd = entity.getEnd();
-                    start = entity.getStart();
-                    foundParts.add(entity.getType());
-                    numberOfMatchParts++;
-                }
-            } else if (entity.getType().equals(startType) && start != -1) {
-                if (numberOfMatchParts >= minPartMatches) {
-                    String value = searchText.substring(start, lastEnd);
-                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER, true));
-                }
-                start = entity.getStart();
-                lastEnd = entity.getEnd();
-                numberOfMatchParts = 0;
-                foundParts = new HashSet<>();
-                foundParts.add(entity.getType());
-                numberOfMatchParts++;
-            } else if (start != -1 && combineSet.contains(entity.getType()) && entity.getStart() - lastEnd < maxDistanceBetween) {
-                lastEnd = entity.getEnd();
-                numberOfMatchParts++;
-                foundParts.add(entity.getType());
-            }
-        }
-
-        if (numberOfMatchParts >= minPartMatches) {
-            String value = searchText.substring(start, lastEnd);
-            found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER, true));
-        }
-
-        if (!found.isEmpty()) {
-            var nonOverlapping = EntitySearchUtils.findNonOverlappingMatchEntities(entities, found);
-            EntitySearchUtils.addEntitiesWithHigherRank(entities, nonOverlapping, dictionary);
-            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-        }
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeContainsAnyOf(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) Set<String> value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.contains(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream()
-                .anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()));
-    }
-
-
-    @SuppressWarnings("unused")
-    @ThenAction
-    public void addFileAttribute(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
-
-        if (fileAttributes == null) {
-            fileAttributes = new ArrayList<>();
-        }
-
-        boolean exists = fileAttributes.stream().anyMatch(f -> f.getLabel().equals(label) && f.getValue().equals(value));
-
-        if (!exists) {
-            fileAttributes.add(FileAttribute.builder().label(label).value(value).build());
-            addedFileAttributes.add(FileAttribute.builder().label(label).value(value).build());
-        }
-    }
-
-
-    @SuppressWarnings("unused")
-    @ThenAction
-    public void addFileAttribute(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
-                                 @Argument(ArgumentType.REGEX) String pattern,
-                                 @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                 @Argument(ArgumentType.INTEGER) int group) {
-
-        if (fileAttributes == null) {
-            fileAttributes = new ArrayList<>();
-        }
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                boolean exists = fileAttributes.stream().anyMatch(f -> f.getLabel().equals(label) && f.getValue().equals(match));
-
-                if (!exists) {
-                    fileAttributes.add(FileAttribute.builder().label(label).value(match).build());
-                    addedFileAttributes.add(FileAttribute.builder().label(label).value(match).build());
-                }
-            }
-        }
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean hasTableHeader(@Argument(ArgumentType.STRING) String headerName) {
-
-        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
-        return tabularData != null && tabularData.containsKey(cleanHeaderName);
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean aiMatchesType(@Argument(ArgumentType.TYPE) String type) {
-
-        return nerEntities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {
-
-        return entities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean matchesImageType(@Argument(ArgumentType.TYPE) String type) {
-
-        return images.stream().anyMatch(image -> !image.isIgnored() && image.getType().equals(type));
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean headlineContainsWord(@Argument(ArgumentType.STRING) String word) {
-
-        return StringUtils.containsIgnoreCase(headline, word);
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean containsRegEx(@Argument(ArgumentType.STRING) String regEx, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive) {
-
-        var compiledPattern = Patterns.getCompiledPattern(regEx, patternCaseInsensitive);
-
-        var matcher = compiledPattern.matcher(text);
-
-        return matcher.find();
-    }
-
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName, @Argument(ArgumentType.STRING) String value) {
-
-        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
-
-        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).toString().equals(value);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type,
-                                    @Argument(ArgumentType.REGEX) String prefixPattern,
-                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                    @Argument(ArgumentType.INTEGER) int group) {
-
-        expandByPrefixRegEx(type, prefixPattern, patternCaseInsensitive, group, null);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type,
-                                    @Argument(ArgumentType.REGEX) String prefixPattern,
-                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                    @Argument(ArgumentType.INTEGER) int group,
-                                    @Argument(ArgumentType.REGEX) String valuePattern) {
-
-        if (StringUtils.isEmpty(prefixPattern)) {
-            return;
-        }
-
-        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
-        var compiledPrefixPattern = Patterns.getCompiledPattern(prefixPattern, patternCaseInsensitive);
-
-        Set<Entity> expanded = new HashSet<>();
-        for (var entity : entities) {
-
-            if (!entity.getType().equals(type) || entity.getTextBefore() == null) {
-                continue;
-            }
-
-            if (valuePattern != null) {
-                var valueMatcher = compiledValuePattern.matcher(entity.getWord());
-                if (!valueMatcher.matches()) {
-                    continue;
-                }
-            }
-
-            var matcher = compiledPrefixPattern.matcher(entity.getTextBefore());
-
-            while (matcher.find()) {
-                var match = matcher.group(group);
-
-                if (StringUtils.isNotBlank(match)) {
-
-                    if (!StringUtils.endsWith(entity.getTextBefore(), match)) {
-                        log.warn("Rules contain invalid group for expandByPrefixRegEx command; prefixPattern:{}, group{}", prefixPattern, group);
-                        continue;
-                    }
-
-                    var expandedEntities = findEntities(match + entity.getWord(),
-                            type,
-                            false,
-                            entity.isRedaction(),
-                            entity.getMatchedRule(),
-                            entity.getRedactionReason(),
-                            entity.getLegalBasis(),
-                            Engine.RULE,
-                            false);
-                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
-                }
-            }
-        }
-
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group) {
-
-        expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group,
-                              @Argument(ArgumentType.REGEX) String valuePattern) {
-
-        if (StringUtils.isEmpty(suffixPattern)) {
-            return;
-        }
-
-        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
-        var compiledSuffixPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
-
-        Set<Entity> expanded = new HashSet<>();
-        for (Entity entity : entities) {
-
-            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
-                continue;
-            }
-
-            if (valuePattern != null) {
-                var valueMatcher = compiledValuePattern.matcher(entity.getWord());
-                if (!valueMatcher.matches()) {
-                    continue;
-                }
-            }
-
-            var matcher = compiledSuffixPattern.matcher(entity.getTextAfter());
-
-            while (matcher.find()) {
-                var match = matcher.group(group);
-
-                if (StringUtils.isNotBlank(match)) {
-
-                    if (!StringUtils.startsWith(entity.getTextAfter(), match)) {
-                        log.warn("Rules contain invalid group for expandByRegEx command; suffixPattern:{}, group{}", suffixPattern, group);
-                        continue;
-                    }
-
-                    var expandedEntities = findEntities(entity.getWord() + match,
-                            type,
-                            false,
-                            entity.isRedaction(),
-                            entity.getMatchedRule(),
-                            entity.getRedactionReason(),
-                            entity.getLegalBasis(),
-                            Engine.RULE,
-                            false);
-                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
-                }
-            }
-        }
-
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactImage(@Argument(ArgumentType.TYPE) String type,
-                            @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                            @Argument(ArgumentType.STRING) String reason,
-                            @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactImage(type, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
-
-        redactImage(type, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redact(@Argument(ArgumentType.TYPE) String type,
-                       @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                       @Argument(ArgumentType.STRING) String reason,
-                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redact(type, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
-
-        redact(type, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactLineAfter(@Argument(ArgumentType.STRING) String start,
-                                @Argument(ArgumentType.TYPE) String asType,
-                                @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                @Argument(ArgumentType.STRING) String reason,
-                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotLineAfter(@Argument(ArgumentType.STRING) String start,
-                                   @Argument(ArgumentType.TYPE) String asType,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                   @Argument(ArgumentType.STRING) String reason) {
-
-        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, null, false);
-
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactByRegExWithNewlines(@Argument(ArgumentType.REGEX) String pattern,
-                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                          @Argument(ArgumentType.INTEGER) int group,
-                                          @Argument(ArgumentType.TYPE) String asType,
-                                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                          @Argument(ArgumentType.STRING) String reason,
-                                          @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactByRegExWithNewlines(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true, skipRemoveEntitiesContainedInLarger);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                 @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                 @Argument(ArgumentType.INTEGER) int group,
-                                 @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                 @Argument(ArgumentType.STRING) String reason) {
-
-        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false, false);
-    }
-
-
-    @Deprecated
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start,
-                              @Argument(ArgumentType.STRING) String stop,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween(start, stop, false, false, asType, ruleNumber, redactEverywhere, false, reason, legalBasis, true, false, false, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start,
-                              @Argument(ArgumentType.STRING) String stop,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween(start, stop, false, false, asType, ruleNumber, redactEverywhere, excludeHeadLine, reason, legalBasis, true, false, false, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start,
-                              @Argument(ArgumentType.STRING) String stop,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis,
-                              @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                              @Argument(ArgumentType.BOOLEAN) boolean sortedResult) {
-
-        redactBetween(start,
-                stop,
-                false,
-                false,
-                asType,
-                ruleNumber,
-                redactEverywhere,
-                excludeHeadLine,
-                reason,
-                legalBasis,
-                true,
-                skipRemoveEntitiesContainedInLarger,
-                sortedResult,
-                false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start,
-                              @Argument(ArgumentType.STRING) String stop,
-                              @Argument(ArgumentType.BOOLEAN) boolean includeStart,
-                              @Argument(ArgumentType.BOOLEAN) boolean includeStop,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis,
-                              @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                              @Argument(ArgumentType.BOOLEAN) boolean sortedResult,
-                              @Argument(ArgumentType.BOOLEAN) boolean ignoreTables) {
-
-        redactBetween(start,
-                stop,
-                includeStart,
-                includeStop,
-                asType,
-                ruleNumber,
-                redactEverywhere,
-                excludeHeadLine,
-                reason,
-                legalBasis,
-                true,
-                skipRemoveEntitiesContainedInLarger,
-                sortedResult,
-                ignoreTables);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start,
-                              @Argument(ArgumentType.STRING) String stop,
-                              @Argument(ArgumentType.BOOLEAN) boolean includeStart,
-                              @Argument(ArgumentType.BOOLEAN) boolean includeStop,
-                              @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis,
-                              @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                              @Argument(ArgumentType.BOOLEAN) boolean sortedResult) {
-
-        redactBetween(start,
-                stop,
-                includeStart,
-                includeStop,
-                asType,
-                ruleNumber,
-                redactEverywhere,
-                excludeHeadLine,
-                reason,
-                legalBasis,
-                true,
-                skipRemoveEntitiesContainedInLarger,
-                sortedResult,
-                false);
-    }
-
-
-    @ThenAction
-    public void redactBetweenRegexes(@Argument(ArgumentType.STRING) String startPattern,
-                                     @Argument(ArgumentType.BOOLEAN) boolean startPatternCaseInsensitive,
-                                     @Argument(ArgumentType.INTEGER) int startGroup,
-                                     @Argument(ArgumentType.BOOLEAN) boolean includeStart,
-                                     @Argument(ArgumentType.STRING) String stopPattern,
-                                     @Argument(ArgumentType.BOOLEAN) boolean stopPatternCaseInsensitive,
-                                     @Argument(ArgumentType.INTEGER) int stopGroup,
-                                     @Argument(ArgumentType.BOOLEAN) boolean includeStop,
-                                     @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                     @Argument(ArgumentType.TYPE) String type,
-                                     @Argument(ArgumentType.STRING) String reason,
-                                     @Argument(ArgumentType.STRING) String legalBasis,
-                                     @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                                     @Argument(ArgumentType.BOOLEAN) boolean sortedResult) {
-
-        String startValue = getFirstRexExMatch(searchText, startPattern, startPatternCaseInsensitive, startGroup);
-
-        if (startValue == null) {
-            return;
-        }
-
-        String searchTextAfter = StringUtils.substringAfter(searchText, startValue);
-
-        String stopValue = getFirstRexExMatch(searchTextAfter, stopPattern, stopPatternCaseInsensitive, stopGroup);
-
-        if (startValue != null && stopValue != null) {
-            redactBetween(startValue,
-                    stopValue,
-                    includeStart,
-                    includeStop,
-                    type,
-                    ruleNumber,
-                    false,
-                    false,
-                    reason,
-                    legalBasis,
-                    true,
-                    skipRemoveEntitiesContainedInLarger,
-                    sortedResult,
-                    false);
-        }
-    }
-
-
-    @Deprecated
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotBetween(@Argument(ArgumentType.STRING) String start,
-                                 @Argument(ArgumentType.STRING) String stop,
-                                 @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                 @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                 @Argument(ArgumentType.STRING) String reason) {
-
-        redactBetween(start, stop, false, false, asType, ruleNumber, redactEverywhere, false, reason, null, false, false, false, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotBetween(@Argument(ArgumentType.STRING) String start,
-                                 @Argument(ArgumentType.STRING) String stop,
-                                 @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                 @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                 @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine,
-                                 @Argument(ArgumentType.STRING) String reason) {
-
-        redactBetween(start, stop, false, false, asType, ruleNumber, redactEverywhere, excludeHeadLine, reason, null, false, false, false, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start,
-                                   @Argument(ArgumentType.STRING) String stop,
-                                   @Argument(ArgumentType.TYPE) String asType,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                   @Argument(ArgumentType.STRING) String reason,
-                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start,
-                                      @Argument(ArgumentType.STRING) String stop,
-                                      @Argument(ArgumentType.TYPE) String asType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                      @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                      @Argument(ArgumentType.STRING) String reason) {
-
-        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader,
-                           @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                           @Argument(ArgumentType.TYPE) String type,
-                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
-                           @Argument(ArgumentType.STRING) String reason,
-                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
-                              @Argument(ArgumentType.STRING) String reason) {
-
-        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                          @Argument(ArgumentType.INTEGER) int group,
-                                          @Argument(ArgumentType.TYPE) String asType,
-                                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                          @Argument(ArgumentType.STRING) String reason,
-                                          @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                             @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                             @Argument(ArgumentType.INTEGER) int group,
-                                             @Argument(ArgumentType.TYPE) String asType,
-                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                             @Argument(ArgumentType.STRING) String reason) {
-
-        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group,
-                                         @Argument(ArgumentType.TYPE) String asType) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(text);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(match);
-            }
-        }
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type,
-                                      @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                      @Argument(ArgumentType.STRING) String reason) {
-
-        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
-                entity.setRedaction(false);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setReferences(references);
-            }
-        });
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix,
-                                   @Argument(ArgumentType.TYPE) String type,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.STRING) String reason,
-                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void addRedaction(@Argument(ArgumentType.STRING) String value,
-                             @Argument(ArgumentType.TYPE) String asType,
-                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                             @Argument(ArgumentType.STRING) String reason,
-                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE, false);
-        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void ignore(@Argument(ArgumentType.TYPE) String type) {
-
-        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.ENTITY));
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void ignoreRecommendations(@Argument(ArgumentType.TYPE) String type) {
-
-        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.RECOMMENDATION));
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void expandToFalsePositiveByRegEx(@Argument(ArgumentType.TYPE) String type,
-                                             @Argument(ArgumentType.STRING) String pattern,
-                                             @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                             @Argument(ArgumentType.INTEGER) int group) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Set<Entity> expanded = new HashSet<>();
-        for (Entity entity : entities) {
-
-            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
-                continue;
-            }
-
-            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
-
-            while (matcher.find()) {
-                String match = matcher.group(group);
-                if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, type, false, false, 0, null, null, Engine.RULE, false));
-                }
-            }
-        }
-
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-        expanded.forEach(e -> e.setEntityType(EntityType.FALSE_POSITIVE));
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group,
-                                         @Argument(ArgumentType.TYPE) String asType) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null, Engine.RULE, false);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-            }
-        }
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType) {
-
-        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE, false);
-        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType) {
-
-        String[] values = StringUtils.substringsBetween(text, start, "\n");
-
-        if (values != null) {
-            for (String value : values) {
-
-                String trimmedValue = value.trim();
-                String cleanValue;
-                if (trimmedValue.startsWith(":")) {
-                    cleanValue = trimmedValue.substring(1).trim();
-                } else {
-                    cleanValue = trimmedValue;
-                }
-
-                if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
-                    localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(cleanValue);
-                }
-            }
-        }
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type) {
-
-        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactSectionText(@Argument(ArgumentType.TYPE) String type,
-                                  @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                  @Argument(ArgumentType.STRING) String reason,
-                                  @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween("", "", type, ruleNumber, false, false, reason, legalBasis, true, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactSectionTextWithoutHeadLine(@Argument(ArgumentType.TYPE) String type,
-                                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                                 @Argument(ArgumentType.STRING) String reason,
-                                                 @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween("", "", type, ruleNumber, false, true, reason, legalBasis, true, false);
-    }
-
-
-    @ThenAction
-    public void redactHeadline(@Argument(ArgumentType.TYPE) String type,
-                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                               @Argument(ArgumentType.STRING) String reason,
-                               @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        if (!headline.isBlank()) {
-
-            String cleanHeadline = headline.replaceAll("\\n", " ").replaceAll("  ", " ").trim();
-            if (searchText.contains(cleanHeadline)) {
-                Set<Entity> found = findEntities(cleanHeadline, type, false, true, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-            }
-        }
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactWordPartByRegEx(@Argument(ArgumentType.REGEX) String pattern,
-                                      @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                      @Argument(ArgumentType.INTEGER) int group,
-                                      @Argument(ArgumentType.INTEGER) int redactGroup,
-                                      @Argument(ArgumentType.TYPE) String asType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                      @Argument(ArgumentType.STRING) String reason,
-                                      @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher findMatcher = compiledPattern.matcher(searchText);
-
-        while (findMatcher.find()) {
-            String findMatch = findMatcher.group(group);
-            if (StringUtils.isNotBlank(findMatch)) {
-                Set<Entity> found = findEntities(findMatch.trim(), asType, false, true, ruleNumber, reason, legalBasis, Engine.RULE, false);
-
-                for (Entity entity : found) {
-
-                    Matcher redactMatcher = compiledPattern.matcher(entity.getWord());
-
-                    while (redactMatcher.find()) {
-                        String redactMatch = redactMatcher.group(redactGroup);
-                        int start = redactMatcher.start(redactGroup);
-
-                        int i = 0;
-                        List<RedTextPosition> newPositions = new ArrayList<>();
-                        TextPositionSequence newSeq = null;
-
-                        for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                            for (TextPositionSequence textPositionSequence : entityPositionSequence.getSequences()) {
-                                for (RedTextPosition textPosition : textPositionSequence.getTextPositions()) {
-                                    if (i >= start && i < start + redactMatch.length()) {
-                                        newPositions.add(textPosition);
-                                        if (newSeq == null) {
-                                            newSeq = textPositionSequence;
-                                        }
-                                    }
-                                    i++;
-                                }
-                            }
-                        }
-
-                        if (newSeq != null) {
-                            newSeq.setTextPositions(newPositions);
-                            entity.setWord(redactMatch);
-                            String plainId = IdBuilder.buildId(List.of(newSeq));
-                            entity.setPositionSequences(List.of(new EntityPositionSequence(plainId, List.of(newSeq), newSeq.getPage())));
-
-                            EntitySearchUtils.addEntitiesWithHigherRank(entities, entity, dictionary);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactSection(@Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        for (SectionArea sectionArea : sectionAreas) {
-
-            RedRectangle2D position = RedRectangle2D.builder()
-                    .height(sectionArea.getHeight() + 4)
-                    .width(sectionArea.getWidth() + 4)
-                    .x(sectionArea.getTopLeft().getX() - 2)
-                    .y(sectionArea.getTopLeft().getY() - 2)
-                    .build();
-
-            log.debug("SectionArea: {}", sectionArea);
-            log.debug("Position {}", position.toString());
-
-            Image image = Image.builder()
-                    .page(sectionArea.getPage())
-                    .position(position)
-                    .redaction(true)
-                    .hasTransparency(false)
-                    .sectionNumber(sectionNumber)
-                    .section(headline)
-                    .matchedRule(ruleNumber)
-                    .legalBasis(legalBasis)
-                    .redactionReason(reason)
-                    .type(type)
-                    .build();
-
-            images.add(image);
-        }
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactLineAfterAcrossColumns(@Argument(ArgumentType.STRING) String start,
-                                             @Argument(ArgumentType.TYPE) String asType,
-                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                             @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                             @Argument(ArgumentType.STRING) String reason,
-                                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLineAfterAcrossColumns(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, false, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactLineAfterAcrossColumns(@Argument(ArgumentType.STRING) String start,
-                                             @Argument(ArgumentType.TYPE) String asType,
-                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                             @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                             @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                                             @Argument(ArgumentType.STRING) String reason,
-                                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLineAfterAcrossColumns(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, skipRemoveEntitiesContainedInLarger, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactLineAfterAcrossColumns(@Argument(ArgumentType.STRING) String start,
-                                             @Argument(ArgumentType.TYPE) String asType,
-                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                             @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                             @Argument(ArgumentType.BOOLEAN) boolean skipRemoveEntitiesContainedInLarger,
-                                             @Argument(ArgumentType.BOOLEAN) boolean onlyExactMatch,
-                                             @Argument(ArgumentType.STRING) String reason,
-                                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLineAfterAcrossColumns(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, skipRemoveEntitiesContainedInLarger, onlyExactMatch);
-    }
-
-
-    private void redactAndRecommendByRegEx(String pattern,
-                                           boolean patternCaseInsensitive,
-                                           int group,
-                                           String asType,
-                                           int ruleNumber,
-                                           String reason,
-                                           String legalBasis,
-                                           boolean redaction) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-        Matcher matcher = compiledPattern.matcher(searchText);
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-                localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(match);
-            }
-        }
-    }
-
-
-    public Set<Entity> findEntities(String value,
-                                    String asType,
-                                    boolean caseInsensitive,
-                                    boolean redacted,
-                                    int ruleNumber,
-                                    String reason,
-                                    String legalBasis,
-                                    Engine engine,
-                                    boolean asRecommendation) {
-
-        String text = caseInsensitive ? searchText.toLowerCase() : searchText;
-        Set<Entity> found = EntitySearchUtils.findEntities(text,
-                new SearchImplementation(value, caseInsensitive),
-                dictionary.getType(asType),
-                new FindEntityDetails(asType, headline, sectionNumber, false, false, engine, asRecommendation ? EntityType.RECOMMENDATION : EntityType.ENTITY));
-        found.forEach(entity -> {
-            if (redacted) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
-
-        var cleared = EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
-        return cleared.stream().filter(f -> !f.isFalsePositive()).collect(Collectors.toSet());
-    }
-
-
-    private void redact(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
-                entity.setRedaction(redaction);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    private void redactImage(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
-
-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(redaction);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-                image.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, boolean addAsRecommendations, String reason, String legalBasis) {
-
-        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
-
-        CellValue value = tabularData.get(cleanHeaderName);
-        if (value == null) {
-            log.warn("Could not find any data for {}.", cellHeader);
-        } else {
-            String word = value.toString();
-
-            Entity entity = new Entity(word,
-                    type,
-                    value.getRowSpanStart(),
-                    value.getRowSpanStart() + word.length(),
-                    headline,
-                    sectionNumber,
-                    false,
-                    false,
-                    Engine.RULE,
-                    EntityType.ENTITY);
-            entity.setRedaction(redact);
-            entity.setMatchedRule(ruleNumber);
-            entity.setRedactionReason(reason);
-            entity.setTargetSequences(value.getTextBlocks()
-                    .stream()
-                    .map(ClassificationTextBlock::getSequences)
-                    .flatMap(Collection::stream)
-                    .collect(Collectors.toList())); // Make sure no other cells with same content are highlighted
-            entity.setLegalBasis(legalBasis);
-
-            Set<Entity> singleEntitySet = new HashSet<>();
-            singleEntitySet.add(entity);
-
-            EntitySearchUtils.clearAndFindPositions(singleEntitySet, searchableText, dictionary, manualRedactions);
-            EntitySearchUtils.removeFalsePositives(singleEntitySet,
-                    searchText,
-                    dictionary.getType(type),
-                    new FindEntityDetails(type, headline, sectionNumber, false, false, Engine.RULE, EntityType.ENTITY));
-
-            if (!singleEntitySet.isEmpty()) {
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, singleEntitySet.iterator().next(), dictionary);
-
-                EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-
-                if (addAsRecommendations && !isLocal()) {
-                    String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
-                    Pattern pattern = Patterns.AUTHOR_TABLE_SPLITTER;
-                    Matcher matcher = pattern.matcher(cleanedWord);
-
-                    while (matcher.find()) {
-                        String match = matcher.group().trim();
-                        if (match.length() >= 3) {
-                            localDictionaryAdds.computeIfAbsent(type, (x) -> new HashSet<>()).add(match);
-                            String lastname = match.split(" ")[0];
-                            localDictionaryAdds.computeIfAbsent(type, (x) -> new HashSet<>()).add(lastname);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
-
-        String[] values = StringUtils.substringsBetween(text, start, "\n");
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(value.trim());
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactLineAfterAcrossColumns(String start,
-                                              String asType,
-                                              int ruleNumber,
-                                              boolean redactEverywhere,
-                                              String reason,
-                                              String legalBasis,
-                                              boolean skipRemoveEntitiesContainedInLarger,
-                                              boolean onlyExactMatch) {
-
-        var stringOffsets = OffsetStringUtils.substringsBetween(searchableText.getAsStringWithLinebreaksSorted(), start, "\n");
-
-        if (stringOffsets != null) {
-            for (var stringOffset : stringOffsets) {
-                if (StringUtils.isNotBlank(stringOffset.getValue())) {
-                    var trimmedOffsetString = stringOffset.trim();
-                    Set<Entity> found = findEntities(trimmedOffsetString.getValue(), asType, false, true, ruleNumber, reason, legalBasis, Engine.RULE, false).stream()
-                            .filter(f -> !onlyExactMatch || f.getStart() == trimmedOffsetString.getStart() && f.getEnd() == trimmedOffsetString.getEnd())
-                            .collect(Collectors.toSet());
-                    found.forEach(f -> f.setSkipRemoveEntitiesContainedInLarger(skipRemoveEntitiesContainedInLarger));
-
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(trimmedOffsetString.getValue());
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactByRegExWithNewlines(String pattern,
-                                           boolean patternCaseInsensitive,
-                                           int group,
-                                           String asType,
-                                           int ruleNumber,
-                                           String reason,
-                                           String legalBasis,
-                                           boolean redaction,
-                                           boolean skipRemoveEntitiesContainedInLarger) {
-
-        Pattern compiledPattern = Patterns.getCompiledMultilinePattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(text);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.replaceAll("\\n", " ").trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                found.forEach(f -> f.setSkipRemoveEntitiesContainedInLarger(skipRemoveEntitiesContainedInLarger));
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-            }
-        }
-    }
-
-
-    private void redactByRegEx(String pattern,
-                               boolean patternCaseInsensitive,
-                               int group,
-                               String asType,
-                               int ruleNumber,
-                               String reason,
-                               String legalBasis,
-                               boolean redaction,
-                               boolean skipRemoveEntitiesContainedInLarger) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                found.forEach(f -> f.setSkipRemoveEntitiesContainedInLarger(skipRemoveEntitiesContainedInLarger));
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-            }
-        }
-    }
-
-
-    private String getFirstRexExMatch(String text, String pattern, boolean patternCaseInsensitive, int group) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-        Matcher matcher = compiledPattern.matcher(text);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                return match;
-            }
-        }
-
-        return null;
-    }
-
-
-    private void redactBetween(String start,
-                               String stop,
-                               boolean includeStart,
-                               boolean includeStop,
-                               String asType,
-                               int ruleNumber,
-                               boolean redactEverywhere,
-                               boolean excludeHeadLine,
-                               String reason,
-                               String legalBasis,
-                               boolean redaction,
-                               boolean skipRemoveEntitiesContainedInLarger,
-                               boolean sortedResult,
-                               boolean ignoreTables) {
-
-        if (isInTable && ignoreTables) {
-            return;
-        }
-
-        String[] values = new String[1];
-
-        if (start.isEmpty() && stop.isEmpty()) {
-            if (excludeHeadLine && searchText.contains(headline)) {
-                values[0] = StringUtils.substringAfter(searchText, headline);
-            } else {
-                values[0] = searchText;
-            }
-        } else if (start.isEmpty() && searchText.contains(stop)) {
-            values[0] = StringUtils.substringBefore(searchText, stop);
-        } else if (stop.isEmpty() && searchText.contains(start)) {
-            values[0] = StringUtils.substringAfter(searchText, start);
-        } else {
-            values = StringUtils.substringsBetween(searchText, start, stop);
-        }
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-
-                    String searchString = value;
-
-                    if (!start.isEmpty() && includeStart) {
-                        searchString = start + searchString;
-                    }
-
-                    if (!stop.isEmpty() && includeStop) {
-                        searchString = searchString + stop;
-                    }
-
-                    Set<Entity> found = findEntities(searchString.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                    found.forEach(f -> {
-                        f.setSkipRemoveEntitiesContainedInLarger(skipRemoveEntitiesContainedInLarger);
-                        if (sortedResult) {
-                            f.setWord(searchableText.getAsStringWithLinebreaksSorted(f.getPositionSequences()
-                                    .stream()
-                                    .map(EntityPositionSequence::getSequences)
-                                    .flatMap(Collection::stream)
-                                    .collect(Collectors.toList())));
-                        }
-                    });
-
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(searchString.trim());
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
-
-        String[] values = StringUtils.substringsBetween(text, start, stop);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    String[] lines = value.split("\n");
-
-                    for (String line : lines) {
-
-                        if (line.trim().length() <= 2) {
-                            return;
-                        }
-
-                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                        if (redactEverywhere && !isLocal()) {
-                            localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(line.trim());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactOrRecommendAiEntities(String type, String asType, boolean redact, int ruleNumber, String reason, String legalBasis) {
-
-        Set<Entity> entitiesOfType = nerEntities.stream().filter(nerEntity -> nerEntity.getType().equals(type)).collect(Collectors.toSet());
-        List<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toList());
-        Set<Entity> found = EntitySearchUtils.findEntities(searchText,
-                new SearchImplementation(values, dictionary.isCaseInsensitiveDictionary(asType)),
-                dictionary.getType(asType),
-                new FindEntityDetails(asType, headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
-        EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
-        found = found.stream().filter(f -> !f.isFalsePositive()).collect(Collectors.toSet());
-
-        Set<Entity> finalResult = new HashSet<>();
-
-        // Only keep Entities with correct offsets from AI Service.
-        for (Entity current : found) {
-            boolean foundSameOffsets = false;
-            for (Entity entity : entitiesOfType) {
-                if (entity.getStart().equals(current.getStart()) && entity.getEnd().equals(current.getEnd())) {
-                    foundSameOffsets = true;
-                    break;
-                }
-            }
-            if (foundSameOffsets) {
-                finalResult.add(current);
-            }
-        }
-
-        var nonOverlapping = EntitySearchUtils.findNonOverlappingMatchEntities(entities, finalResult);
-
-        if (redact) {
-            nonOverlapping.forEach(entity -> {
-                entity.setRedaction(true);
-                entity.setEntityType(EntityType.ENTITY);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            });
-        }
-
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, nonOverlapping, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-        nerEntities.removeAll(entitiesOfType);
-    }
-
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface WhenCondition {
-
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface ThenAction {
-
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.PARAMETER)
-    public @interface Argument {
-
-        ArgumentType value() default ArgumentType.STRING;
-
-    }
-
-}
-
-
-
-
-
-
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/TenantDictionary.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/dictionary/TenantDictionary.java
similarity index 80%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/TenantDictionary.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/dictionary/TenantDictionary.java
index 0488942e..7b666eb1 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/TenantDictionary.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/dictionary/TenantDictionary.java
@@ -1,10 +1,8 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.redaction.model.dictionary;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryRepresentation;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelService.java
deleted file mode 100644
index 1d446ebc..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.rulebuilder;
-
-import com.iqser.red.service.redaction.v1.model.Argument;
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-import com.iqser.red.service.redaction.v1.model.RuleElement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-
-import org.springframework.stereotype.Service;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class RuleBuilderModelService {
-
-    public RuleBuilderModel getRuleBuilderModel() {
-
-        var whenConditions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.WhenCondition.class)).collect(Collectors.toList());
-        var thenActions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.ThenAction.class)).collect(Collectors.toList());
-
-        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
-
-        ruleBuilderModel.setWhenClauses(whenConditions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
-        ruleBuilderModel.setThenConditions(thenActions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
-
-        return ruleBuilderModel;
-    }
-
-
-    private List<Argument> toArguments(Method c) {
-
-        return Arrays.stream(c.getParameters())
-                .map(parameter -> new Argument(parameter.getName(), parameter.getAnnotation(Section.Argument.class).value()))
-                .collect(Collectors.toList());
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/AnalyzeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java
similarity index 76%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/AnalyzeService.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java
index cb416fc2..96b6ae92 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/AnalyzeService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeService.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service.analyze;
+package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
 
@@ -20,6 +20,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.legalbasis.LegalBasis;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogChanges;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogLegalBasis;
 import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
@@ -27,31 +28,22 @@ import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.ImageServiceResponseAdapter;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SectionText;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SimplifiedSectionText;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SimplifiedText;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentDataMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentGraphMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.factory.DocumentGraphFactory;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntitiesAdapter;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrement;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionChangeLogService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.SectionGridCreatorService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.SectionTextBuilderService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.entityredaction.EntityRedactionService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
@@ -80,11 +72,10 @@ public class AnalyzeService {
     RedactionChangeLogService redactionChangeLogService;
     LegalBasisClient legalBasisClient;
     RedactionServiceSettings redactionServiceSettings;
-    SectionTextBuilderService sectionTextBuilderService;
     SectionGridCreatorService sectionGridCreatorService;
     ImageServiceResponseAdapter imageServiceResponseAdapter;
     ImportedRedactionService importedRedactionService;
-    SectionFinder sectionFinder;
+    SectionFinderService sectionFinderService;
 
     FunctionTimerValues redactmanagerAnalyzePagewiseValues;
 
@@ -95,7 +86,7 @@ public class AnalyzeService {
         long startTime = System.currentTimeMillis();
 
         var pageCount = 0;
-        Document classifiedDoc;
+        ClassificationDocument classifiedDoc;
 
         try {
             var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest.getDossierId(),
@@ -113,22 +104,20 @@ public class AnalyzeService {
             throw new RedactionException(e);
         }
 
-        DocumentGraph documentGraph = DocumentGraphFactory.buildDocumentGraph(classifiedDoc);
+        Document document = DocumentGraphFactory.buildDocumentGraph(classifiedDoc);
 
-        List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
-
-        sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount, sectionTexts);
+        sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
 
         log.info("Store document graph, text, simplified text, and section grid for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, DocumentDataMapper.toDocumentData(documentGraph));
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SIMPLIFIED_TEXT, toSimplifiedText(documentGraph));
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, DocumentDataMapper.toDocumentData(document));
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SIMPLIFIED_TEXT, toSimplifiedText(document));
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc.getSectionGrid());
 
         return AnalyzeResult.builder()
                 .dossierId(analyzeRequest.getDossierId())
                 .fileId(analyzeRequest.getFileId())
                 .duration(System.currentTimeMillis() - startTime)
-                .numberOfPages(documentGraph.getNumberOfPages())
+                .numberOfPages(document.getNumberOfPages())
                 .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                 .build();
     }
@@ -138,9 +127,9 @@ public class AnalyzeService {
     public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
-        DocumentGraph documentGraph = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+        Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
 
-        NerEntities nerEntities = getEntityRecognitionEntities(analyzeRequest, documentGraph);
+        NerEntities nerEntities = getEntityRecognitionEntities(analyzeRequest, document);
 
         dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
         KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
@@ -149,11 +138,11 @@ public class AnalyzeService {
 
         log.debug("Starting Dictionary Search");
         long dictSearchStart = System.currentTimeMillis();
-        entityRedactionService.addDictionaryEntities(dictionary, documentGraph);
+        entityRedactionService.addDictionaryEntities(dictionary, document);
         log.debug("Finished Dictionary Search in {} ms", System.currentTimeMillis() - dictSearchStart);
-        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, documentGraph, kieContainer, analyzeRequest, nerEntities);
+        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, document, kieContainer, analyzeRequest, nerEntities);
 
-        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(documentGraph, analyzeRequest.getDossierTemplateId());
+        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(document, analyzeRequest.getDossierTemplateId());
 
         List<LegalBasis> legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
         RedactionLog redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(),
@@ -172,7 +161,7 @@ public class AnalyzeService {
                 true);
         redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
 
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, documentGraph.getNumberOfPages(), dictionary.getVersion(), false, addedFileAttributes);
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, document.getNumberOfPages(), dictionary.getVersion(), false, addedFileAttributes);
     }
 
 
@@ -181,26 +170,32 @@ public class AnalyzeService {
     public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
-        RedactionLog redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        DocumentGraph documentGraph = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
 
         // not yet ready for reanalysis
-        if (redactionLog == null || documentGraph == null || documentGraph.getNumberOfPages() == 0) {
+        if (previousRedactionLog == null || document == null || document.getNumberOfPages() == 0) {
             return analyze(analyzeRequest);
         }
 
         DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(),
-                new DictionaryVersion(redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()),
+                new DictionaryVersion(previousRedactionLog.getDictionaryVersion(), previousRedactionLog.getDossierDictionaryVersion()),
                 analyzeRequest.getDossierId());
 
-        Set<Integer> sectionsToReanalyseIds = getSectionsToReanalyseIds(analyzeRequest, redactionLog, documentGraph, dictionaryIncrement);
-        List<SemanticNode> sectionsToReAnalyse = getSectionsToReAnalyse(documentGraph, sectionsToReanalyseIds);
+        Set<Integer> sectionsToReanalyseIds = getSectionsToReanalyseIds(analyzeRequest, previousRedactionLog, document, dictionaryIncrement);
+        List<SemanticNode> sectionsToReAnalyse = getSectionsToReAnalyse(document, sectionsToReanalyseIds);
 
         if (sectionsToReAnalyse.isEmpty()) {
-            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, documentGraph.getNumberOfPages(), dictionaryIncrement.getDictionaryVersion(), true, new HashSet<>());
+            return finalizeAnalysis(analyzeRequest,
+                    startTime,
+                    previousRedactionLog,
+                    document.getNumberOfPages(),
+                    dictionaryIncrement.getDictionaryVersion(),
+                    true,
+                    new HashSet<>());
         }
 
-        NerEntities nerEntities = getEntityRecognitionEntitiesFilteredBySectionIds(analyzeRequest, documentGraph, sectionsToReanalyseIds);
+        NerEntities nerEntities = getEntityRecognitionEntitiesFilteredBySectionIds(analyzeRequest, document, sectionsToReanalyseIds);
         log.info("Reanalyze {} sections with {} Ner Entities", sectionsToReAnalyse.size(), nerEntities.getNerEntityList().size());
         KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
@@ -208,10 +203,10 @@ public class AnalyzeService {
         sectionsToReAnalyse.forEach(node -> entityRedactionService.addDictionaryEntities(dictionary, node));
 
         long ruleStart = System.currentTimeMillis();
-        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, documentGraph, sectionsToReAnalyse, kieContainer, analyzeRequest, nerEntities);
+        Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, document, sectionsToReAnalyse, kieContainer, analyzeRequest, nerEntities);
         log.info("Rule execution took {} ms", System.currentTimeMillis() - ruleStart);
 
-        List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(documentGraph, analyzeRequest.getDossierTemplateId());
+        List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document, analyzeRequest.getDossierTemplateId());
 
         var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(),
                 analyzeRequest.getDossierId(),
@@ -219,10 +214,17 @@ public class AnalyzeService {
                 newRedactionLogEntries,
                 false);
 
-        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(IMPORTED_REDACTION_TYPE));
-        redactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
+        previousRedactionLog.getRedactionLogEntry()
+                .removeIf(entry -> sectionsToReanalyseIds.contains(entry.getSectionNumber()) && !entry.getType().equals(IMPORTED_REDACTION_TYPE));
+        previousRedactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
 
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, documentGraph.getNumberOfPages(), dictionaryIncrement.getDictionaryVersion(), true, addedFileAttributes);
+        return finalizeAnalysis(analyzeRequest,
+                startTime,
+                previousRedactionLog,
+                document.getNumberOfPages(),
+                dictionaryIncrement.getDictionaryVersion(),
+                true,
+                addedFileAttributes);
     }
 
 
@@ -239,7 +241,7 @@ public class AnalyzeService {
 
         excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
 
-        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(),
+        RedactionLogChanges redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(),
                 analyzeRequest.getFileId(),
                 redactionLog,
                 analyzeRequest.getAnalysisNumber());
@@ -268,27 +270,27 @@ public class AnalyzeService {
     }
 
 
-    private static List<SemanticNode> getSectionsToReAnalyse(DocumentGraph documentGraph, Set<Integer> sectionsToReanalyseIds) {
+    private static List<SemanticNode> getSectionsToReAnalyse(Document document, Set<Integer> sectionsToReanalyseIds) {
 
-        return documentGraph.streamChildren().filter(section -> sectionsToReanalyseIds.contains(section.getTocId().get(0))).collect(Collectors.toList());
+        return document.streamChildren().filter(section -> sectionsToReanalyseIds.contains(section.getTreeId().get(0))).collect(Collectors.toList());
     }
 
 
-    private Set<Integer> getSectionsToReanalyseIds(AnalyzeRequest analyzeRequest, RedactionLog redactionLog, DocumentGraph documentGraph, DictionaryIncrement dictionaryIncrement) {
+    private Set<Integer> getSectionsToReanalyseIds(AnalyzeRequest analyzeRequest, RedactionLog redactionLog, Document document, DictionaryIncrement dictionaryIncrement) {
 
         return analyzeRequest.getSectionsToReanalyse().isEmpty() //
-                ? sectionFinder.findSectionsToReanalyse(dictionaryIncrement, redactionLog, documentGraph, analyzeRequest) //
+                ? sectionFinderService.findSectionsToReanalyse(dictionaryIncrement, redactionLog, document, analyzeRequest) //
                 : analyzeRequest.getSectionsToReanalyse();
     }
 
 
-    private NerEntities getEntityRecognitionEntitiesFilteredBySectionIds(AnalyzeRequest analyzeRequest, DocumentGraph documentGraph, Set<Integer> sectionsToReanalyseIds) {
+    private NerEntities getEntityRecognitionEntitiesFilteredBySectionIds(AnalyzeRequest analyzeRequest, Document document, Set<Integer> sectionsToReanalyseIds) {
 
         NerEntities nerEntities;
         if (redactionServiceSettings.isNerServiceEnabled()) {
             NerEntitiesModel nerEntitiesModel = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
             nerEntitiesModel = filterNerEntitiesModelBySectionIds(sectionsToReanalyseIds, nerEntitiesModel);
-            nerEntities = nerEntitiesAdapter.toNerEntities(nerEntitiesModel, documentGraph);
+            nerEntities = nerEntitiesAdapter.toNerEntities(nerEntitiesModel, document);
         } else {
             nerEntities = new NerEntities(Collections.emptyList());
         }
@@ -304,11 +306,11 @@ public class AnalyzeService {
     }
 
 
-    private NerEntities getEntityRecognitionEntities(AnalyzeRequest analyzeRequest, DocumentGraph documentGraph) {
+    private NerEntities getEntityRecognitionEntities(AnalyzeRequest analyzeRequest, Document document) {
 
         NerEntities nerEntities;
         if (redactionServiceSettings.isNerServiceEnabled()) {
-            nerEntities = nerEntitiesAdapter.toNerEntities(redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId()), documentGraph);
+            nerEntities = nerEntitiesAdapter.toNerEntities(redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId()), document);
         } else {
             nerEntities = new NerEntities(Collections.emptyList());
         }
@@ -334,16 +336,16 @@ public class AnalyzeService {
     }
 
 
-    private SimplifiedText toSimplifiedText(DocumentGraph documentGraph) {
+    private SimplifiedText toSimplifiedText(Document document) {
 
-        List<SimplifiedSectionText> simplifiedSectionTexts = documentGraph.getMainSections().stream().map(this::toSimplifiedSectionText).toList();
-        return SimplifiedText.builder().numberOfPages(documentGraph.getNumberOfPages()).sectionTexts(simplifiedSectionTexts).build();
+        List<SimplifiedSectionText> simplifiedSectionTexts = document.getMainSections().stream().map(this::toSimplifiedSectionText).toList();
+        return SimplifiedText.builder().numberOfPages(document.getNumberOfPages()).sectionTexts(simplifiedSectionTexts).build();
     }
 
 
-    private SimplifiedSectionText toSimplifiedSectionText(SectionNode sectionNode) {
+    private SimplifiedSectionText toSimplifiedSectionText(Section section) {
 
-        return SimplifiedSectionText.builder().sectionNumber(sectionNode.getTocId().get(0)).text(sectionNode.buildTextBlock().getSearchText()).build();
+        return SimplifiedSectionText.builder().sectionNumber(section.getTreeId().get(0)).text(section.buildTextBlock().getSearchText()).build();
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
index 5b56dab5..8251a0a7 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java
@@ -22,7 +22,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
-import com.iqser.red.service.redaction.v1.server.redaction.model.TenantDictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryEntries;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrement;
@@ -30,6 +29,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dict
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryRepresentation;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.TenantDictionary;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 
 import feign.FeignException;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java
index e0a8cf58..394003b5 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java
@@ -23,14 +23,12 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.ManualRedactionApplicationService;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntitiesAdapter;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
 
 import io.micrometer.core.annotation.Timed;
@@ -66,7 +64,7 @@ public class DroolsExecutionService {
 
     @Timed("redactmanager_executeRules")
     public List<FileAttribute> executeRules(KieContainer kieContainer,
-                                            DocumentGraph document,
+                                            Document document,
                                             Dictionary dictionary,
                                             List<FileAttribute> fileAttributes,
                                             ManualRedactions manualRedactions,
@@ -78,7 +76,7 @@ public class DroolsExecutionService {
 
     @Timed("redactmanager_executeRules")
     public List<FileAttribute> executeRules(KieContainer kieContainer,
-                                            DocumentGraph document,
+                                            Document document,
                                             List<SemanticNode> sectionsToAnalyze,
                                             Dictionary dictionary,
                                             List<FileAttribute> fileAttributes,
@@ -116,20 +114,6 @@ public class DroolsExecutionService {
     }
 
 
-    @Timed("redactmanager_executeRules")
-    public Section executeRules(KieContainer kieContainer, Section section) {
-
-        KieSession kieSession = kieContainer.newKieSession();
-        kieSession.setGlobal("section", section);
-        kieSession.insert(section);
-        kieSession.fireAllRules();
-        kieSession.dispose();
-
-        return section;
-
-    }
-
-
     public List<FileAttribute> getFileAttributes(KieSession kieSession) {
 
         List<FileAttribute> fileAttributes = new LinkedList<>();
@@ -141,17 +125,6 @@ public class DroolsExecutionService {
     }
 
 
-    public List<Entity> getEntities(KieSession ks) {
-
-        List<Entity> entities = new LinkedList<>();
-        QueryResults entitiesResult = ks.getQueryResults("getEntities");
-        for (QueryResultsRow resultsRow : entitiesResult) {
-            entities.add((Entity) resultsRow.get("$result"));
-        }
-        return entities;
-    }
-
-
     public KieContainer updateRules(String dossierTemplateId) {
 
         long version = rulesClient.getVersion(dossierTemplateId);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
similarity index 88%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityRedactionService.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
index d2f75d45..9bebefd7 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityRedactionService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service.entityredaction;
+package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import java.util.List;
 import java.util.Set;
@@ -10,16 +10,15 @@ import org.springframework.stereotype.Service;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
@@ -36,16 +35,12 @@ public class EntityRedactionService {
     EntityCreationService entityCreationService;
 
 
-    public Set<FileAttribute> addRuleEntities(Dictionary dictionary,
-                                              DocumentGraph documentGraph,
-                                              KieContainer kieContainer,
-                                              AnalyzeRequest analyzeRequest,
-                                              NerEntities nerEntities) {
+    public Set<FileAttribute> addRuleEntities(Dictionary dictionary, Document document, KieContainer kieContainer, AnalyzeRequest analyzeRequest, NerEntities nerEntities) {
 
         log.debug("Starting Drools Execution");
         long droolsStart = System.currentTimeMillis();
         List<FileAttribute> allFileAttributes = droolsExecutionService.executeRules(kieContainer,
-                documentGraph,
+                document,
                 dictionary,
                 analyzeRequest.getFileAttributes(),
                 analyzeRequest.getManualRedactions(),
@@ -56,7 +51,7 @@ public class EntityRedactionService {
 
 
     public Set<FileAttribute> addRuleEntities(Dictionary dictionary,
-                                              DocumentGraph documentGraph,
+                                              Document document,
                                               List<SemanticNode> sectionsToReanalyze,
                                               KieContainer kieContainer,
                                               AnalyzeRequest analyzeRequest,
@@ -65,7 +60,7 @@ public class EntityRedactionService {
         log.debug("Starting Drools execution");
         long ruleExecutionStart = System.currentTimeMillis();
         List<FileAttribute> allFileAttributes = droolsExecutionService.executeRules(kieContainer,
-                documentGraph,
+                document,
                 sectionsToReanalyze,
                 dictionary,
                 analyzeRequest.getFileAttributes(),
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java
index 37339554..024af3f6 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ManualRedactionSurroundingTextService.java
@@ -1,8 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
@@ -11,18 +14,16 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResu
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SectionText;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.Text;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentGraphMapper;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionPosition;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RectangleMapper;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
 import io.micrometer.core.annotation.Timed;
@@ -35,36 +36,34 @@ import lombok.extern.slf4j.Slf4j;
 public class ManualRedactionSurroundingTextService {
 
     private final RedactionStorageService redactionStorageService;
-    private final RedactionServiceSettings redactionServiceSettings;
+    private final EntityCreationService entityCreationService;
 
 
     @Timed("redactmanager_surroundingTextAnalysis")
     public AnalyzeResult addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
 
         long startTime = System.currentTimeMillis();
-        Text text = redactionStorageService.getText(dossierId, fileId);
+        Document text = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(dossierId, fileId));
         List<ManualRedactionEntry> processedAddRedactions = new ArrayList<>();
 
-        for (SectionText sectionText : text.getSectionTexts()) {
+        for (SemanticNode node : text.streamChildren().toList()) {
 
             if (manualRedactions.getEntriesToAdd().isEmpty()) {
                 break;
             }
 
-            for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-
-                var addItty = manualRedactions.getEntriesToAdd().iterator();
-                while (addItty.hasNext()) {
-                    var manualAddRedaction = addItty.next();
-                    if (sectionContainsEntry(sectionArea, manualAddRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction.getPositions());
-                        manualAddRedaction.setTextBefore(surroundingText.getLeft());
-                        manualAddRedaction.setTextAfter(surroundingText.getRight());
-                        processedAddRedactions.add(manualAddRedaction);
-                        addItty.remove();
-                    }
+            var addItty = manualRedactions.getEntriesToAdd().iterator();
+            while (addItty.hasNext()) {
+                var manualAddRedaction = addItty.next();
+                if (sectionContainsEntry(node, manualAddRedaction.getPositions())) {
+                    Pair<String, String> surroundingText = findSurroundingText(node, manualAddRedaction.getValue(), manualAddRedaction.getPositions());
+                    manualAddRedaction.setTextBefore(surroundingText.getLeft());
+                    manualAddRedaction.setTextAfter(surroundingText.getRight());
+                    processedAddRedactions.add(manualAddRedaction);
+                    addItty.remove();
                 }
             }
+
         }
 
         manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
@@ -73,43 +72,22 @@ public class ManualRedactionSurroundingTextService {
     }
 
 
-    private Pair<String, String> findSurroundingText(SectionText sectionText, String value, List<Rectangle> toFindPositions) {
+    private Pair<String, String> findSurroundingText(SemanticNode node, String value, List<Rectangle> toFindPositions) {
 
-        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(),
-                new SearchImplementation(value, false),
-                new FindEntityDetails("dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, EntityType.ENTITY));
-        Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null, null);
-
-        Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
-
-        if (correctEntity == null) {
-            log.warn("Could not calculate surrounding text");
-            return Pair.of("", "");
-        }
-
-        if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
-            SurroundingWordsService.addSurroundingText(Set.of(correctEntity),
-                    sectionText.getSearchableText(),
-                    null,
-                    sectionText.getCellStarts(),
-                    redactionServiceSettings.getSurroundingWordsOffsetWindow(),
-                    redactionServiceSettings.getNumberOfSurroundingWords());
-        } else {
-            SurroundingWordsService.addSurroundingText(Set.of(correctEntity),
-                    sectionText.getSearchableText(),
-                    null,
-                    redactionServiceSettings.getSurroundingWordsOffsetWindow(),
-                    redactionServiceSettings.getNumberOfSurroundingWords());
-        }
+        Set<RedactionEntity> entities = RedactionSearchUtility.findBoundariesByString(value, node.buildTextBlock())
+                .stream()
+                .map(boundary -> entityCreationService.byBoundary(boundary, "searchHelper", EntityType.RECOMMENDATION, node))
+                .collect(Collectors.toSet());
 
+        RedactionEntity correctEntity = getEntityOnCorrectPosition(entities, toFindPositions);
         return Pair.of(correctEntity.getTextBefore(), correctEntity.getTextAfter());
     }
 
 
-    private boolean sectionContainsEntry(SectionArea sectionArea, List<Rectangle> positions) {
+    private boolean sectionContainsEntry(SemanticNode semanticNode, List<Rectangle> positions) {
 
         for (Rectangle position : positions) {
-            if (sectionArea.contains(position)) {
+            if (semanticNode.containsRectangle(RectangleMapper.toRectangle2D(position), position.getPage())) {
                 return true;
             }
         }
@@ -117,30 +95,22 @@ public class ManualRedactionSurroundingTextService {
     }
 
 
-    private Entity getEntityOnCorrectPosition(Set<Entity> entitiesWithPositions, List<Rectangle> toFindPositions) {
+    private RedactionEntity getEntityOnCorrectPosition(Set<RedactionEntity> entities, List<Rectangle> toFindPositions) {
 
-        for (Entity entityWithPos : entitiesWithPositions) {
-            for (EntityPositionSequence entityPositionSequence : entityWithPos.getPositionSequences()) {
-                for (TextPositionSequence textPositionSequence : entityPositionSequence.getSequences()) {
-                    for (Rectangle manualRedactionRectangle : toFindPositions) {
-                        if (intersects(manualRedactionRectangle, textPositionSequence.getRectangle())) {
-                            return entityWithPos;
-                        }
-                    }
-                }
-            }
-        }
-
-        return null;
+        return entities.stream()
+                .filter(entity -> entity.getRedactionPositionsPerPage()
+                        .stream()
+                        .map(RedactionPosition::getRectanglePerLine)
+                        .flatMap(Collection::stream)
+                        .allMatch(rectangle2D -> toFindPositionsIntersectRectangle(toFindPositions, rectangle2D)))
+                .findFirst()
+                .orElseThrow(() -> new NotFoundException("No matching Entity could be found for positions" + toFindPositions));
     }
 
 
-    public boolean intersects(Rectangle manualPosition, com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle textPositionRectangle) {
+    private static boolean toFindPositionsIntersectRectangle(List<Rectangle> toFindPositions, Rectangle2D rectangle2D) {
 
-        return textPositionRectangle.getTopLeft().getX() + textPositionRectangle.getWidth() > manualPosition.getTopLeftX() && textPositionRectangle.getTopLeft()
-                .getY() + textPositionRectangle.getHeight() > manualPosition.getTopLeftY() && textPositionRectangle.getTopLeft()
-                .getX() < manualPosition.getTopLeftX() + manualPosition.getWidth() && textPositionRectangle.getTopLeft()
-                .getY() < manualPosition.getTopLeftY() + manualPosition.getHeight();
+        return toFindPositions.stream().map(RectangleMapper::toRectangle2D).anyMatch(toFindRectangle -> toFindRectangle.intersects(rectangle2D));
     }
 
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java
index 9b005c05..47a0efd4 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogCreatorService.java
@@ -11,12 +11,12 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageNode;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,15 +29,15 @@ public class RedactionLogCreatorService {
     private final DictionaryService dictionaryService;
 
 
-    public List<RedactionLogEntry> createRedactionLog(DocumentGraph documentGraph, String dossierTemplateId) {
+    public List<RedactionLogEntry> createRedactionLog(Document document, String dossierTemplateId) {
 
         List<RedactionLogEntry> entries = new ArrayList<>();
         Set<String> processedIds = new HashSet<>();
-        documentGraph.getEntities()
+        document.getEntities()
                 .stream()
                 .filter(RedactionLogCreatorService::isEntityOrRecommendationType)
                 .forEach(entityNode -> entries.addAll(toRedactionLogEntries(entityNode, processedIds, dossierTemplateId)));
-        documentGraph.streamAllImages().forEach(imageNode -> entries.add(createRedactionLogEntry(imageNode, dossierTemplateId)));
+        document.streamAllImages().forEach(imageNode -> entries.add(createRedactionLogEntry(imageNode, dossierTemplateId)));
         return entries;
     }
 
@@ -67,7 +67,7 @@ public class RedactionLogCreatorService {
 
             List<Rectangle> rectanglesPerLine = redactionPosition.getRectanglePerLine()
                     .stream()
-                    .map(rectangle2D -> toRedactionLogRectangle(rectangle2D, redactionPosition.getPageNode().getNumber()))
+                    .map(rectangle2D -> toRedactionLogRectangle(rectangle2D, redactionPosition.getPage().getNumber()))
                     .toList();
 
             redactionLogEntry.setPositions(rectanglesPerLine);
@@ -85,7 +85,7 @@ public class RedactionLogCreatorService {
                 .stream()
                 .filter(redactionEntity -> !redactionEntity.isRemoved() && !redactionEntity.isIgnored())
                 .forEach(ref -> ref.getRedactionPositionsPerPage().forEach(pos -> referenceIds.add(pos.getId())));
-        int sectionNumber = entity.getDeepestFullyContainingNode().getTocId().isEmpty() ? -1 : entity.getDeepestFullyContainingNode().getTocId().get(0);
+        int sectionNumber = entity.getDeepestFullyContainingNode().getTreeId().isEmpty() ? -1 : entity.getDeepestFullyContainingNode().getTreeId().get(0);
 
         return RedactionLogEntry.builder()
                 .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
@@ -112,7 +112,7 @@ public class RedactionLogCreatorService {
     }
 
 
-    public RedactionLogEntry createRedactionLogEntry(ImageNode image, String dossierTemplateId) {
+    public RedactionLogEntry createRedactionLogEntry(Image image, String dossierTemplateId) {
 
         String imageType = image.getImageType().equals(ImageType.OTHER) ? "image" : image.getImageType().toString().toLowerCase();
         return RedactionLogEntry.builder()
@@ -128,7 +128,7 @@ public class RedactionLogCreatorService {
                 .isDictionaryEntry(false)
                 .isRecommendation(false)
                 .positions(List.of(toRedactionLogRectangle(image.getPosition(), image.getPage().getNumber())))
-                .sectionNumber(image.getTocId().get(0))
+                .sectionNumber(image.getTreeId().get(0))
                 .section(image.getParent().buildTextBlock().getSearchText())
                 .imageHasTransparency(image.isTransparent())
                 .build();
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RuleBuilderModelService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RuleBuilderModelService.java
new file mode 100644
index 00000000..bfeb815d
--- /dev/null
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RuleBuilderModelService.java
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.util.Collections;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+
+@Service
+public class RuleBuilderModelService {
+
+    public RuleBuilderModel getRuleBuilderModel() {
+
+        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
+
+        ruleBuilderModel.setWhenClauses(Collections.emptyList());
+        ruleBuilderModel.setThenConditions(Collections.emptyList());
+
+        return ruleBuilderModel;
+    }
+
+}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/SectionFinder.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionFinderService.java
similarity index 73%
rename from redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/SectionFinder.java
rename to redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionFinderService.java
index ae6d897b..4fa9ea20 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/SectionFinder.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionFinderService.java
@@ -1,8 +1,6 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service.analyze;
+package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -16,12 +14,9 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrement;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryIncrementValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
@@ -36,31 +31,27 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 @RequiredArgsConstructor
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-class SectionFinder {
+class SectionFinderService {
 
     @Timed("redactmanager_findSectionsToReanalyse")
-    public Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog, DocumentGraph documentGraph, AnalyzeRequest analyzeRequest) {
+    public Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog, Document document, AnalyzeRequest analyzeRequest) {
 
         long start = System.currentTimeMillis();
         Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
 
         Set<Integer> sectionsToReanalyse = new HashSet<>();
-        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
         for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
             if (entry.isLocalManualRedaction() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
                 sectionsToReanalyse.add(entry.getSectionNumber());
             }
-            if (entry.isImage()) {
-                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
-            }
         }
 
         var dictionaryIncrementsSearch = new SearchImplementation(dictionaryIncrement.getValues().stream().map(DictionaryIncrementValue::getValue).collect(Collectors.toList()),
                 true);
 
-        documentGraph.streamChildren().forEach(mainNode -> {
+        document.streamChildren().forEach(mainNode -> {
             if (dictionaryIncrementsSearch.atLeastOneMatches(mainNode.buildTextBlock().getSearchText())) {
-                sectionsToReanalyse.add(mainNode.getTocId().get(0));
+                sectionsToReanalyse.add(mainNode.getTreeId().get(0));
             }
         });
 
@@ -83,19 +74,4 @@ class SectionFinder {
                                         manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))).collect(Collectors.toSet());
     }
 
-
-    private static Image convert(RedactionLogEntry entry) {
-
-        Rectangle position = entry.getPositions().get(0);
-
-        return Image.builder()
-                .type(entry.getType())
-                .position(new RedRectangle2D(position.getTopLeft().getX(), position.getTopLeft().getY(), position.getWidth(), position.getHeight()))
-                .sectionNumber(entry.getSectionNumber())
-                .section(entry.getSection())
-                .page(position.getPage())
-                .hasTransparency(entry.isImageHasTransparency())
-                .build();
-    }
-
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionGridCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionGridCreatorService.java
index ea1ec596..f1914369 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionGridCreatorService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionGridCreatorService.java
@@ -2,22 +2,18 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.CellRectangle;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionRectangle;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Section;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationSection;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SectionText;
 
 import lombok.RequiredArgsConstructor;
 
@@ -25,28 +21,21 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class SectionGridCreatorService {
 
-    public void createSectionGrid(Document classifiedDoc, int numberOfPages, List<SectionText> sectionTexts) {
+    public void createSectionGrid(ClassificationDocument classifiedDoc, int numberOfPages) {
 
         for (int page = 1; page <= numberOfPages; page++) {
             addSectionGrid(classifiedDoc, page);
         }
-        // enhance section grid with headline data
-        sectionTexts.forEach(sectionText -> classifiedDoc.getSectionGrid()
-                .getSections()
-                .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
-                        sectionText.getHeadline(),
-                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
-                        sectionText.getSectionAreas())));
     }
 
 
-    private void addSectionGrid(Document classifiedDoc, int page) {
+    private void addSectionGrid(ClassificationDocument classifiedDoc, int page) {
 
-        for (Section paragraph : classifiedDoc.getSections()) {
+        for (ClassificationSection section : classifiedDoc.getSections()) {
 
-            for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
+            for (int i = 0; i <= section.getPageBlocks().size() - 1; i++) {
 
-                AbstractPageBlock textBlock = paragraph.getPageBlocks().get(i);
+                AbstractPageBlock textBlock = section.getPageBlocks().get(i);
 
                 if (textBlock.getPage() != page) {
                     continue;
@@ -62,7 +51,7 @@ public class SectionGridCreatorService {
                                     tb.getPdfMaxX() - tb.getPdfMinX(),
                                     tb.getPdfMaxY() - tb.getPdfMinY(),
                                     i + 1,
-                                    paragraph.getPageBlocks().size(),
+                                    section.getPageBlocks().size(),
                                     null));
 
                 } else if (textBlock instanceof TablePageBlock) {
@@ -83,7 +72,7 @@ public class SectionGridCreatorService {
                                     textBlock.getWidth(),
                                     textBlock.getHeight(),
                                     i + 1,
-                                    paragraph.getPageBlocks().size(),
+                                    section.getPageBlocks().size(),
                                     cellRectangles));
 
                 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
deleted file mode 100644
index a95ca514..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SectionTextBuilderService.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Footer;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Header;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Section;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.SectionText;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.UnclassifiedText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class SectionTextBuilderService {
-
-    public List<SectionText> buildSectionText(Document classifiedDoc) {
-
-        List<SectionText> sectionTexts = new ArrayList<>();
-        AtomicInteger sectionNumber = new AtomicInteger(1);
-        for (Section section : classifiedDoc.getSections()) {
-
-            List<TablePageBlock> tables = section.getTables();
-            for (TablePageBlock table : tables) {
-                sectionTexts.addAll(processTablePerRow(table, sectionNumber));
-                sectionNumber.incrementAndGet();
-            }
-            sectionTexts.add(processText(section.getSearchableText(), section.getTextBlocks(), section.getHeadline(), sectionNumber, section.getImages()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (Header header : classifiedDoc.getHeaders()) {
-            sectionTexts.add(processText(header.getSearchableText(), header.getTextBlocks(), "Header", sectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (Footer footer : classifiedDoc.getFooters()) {
-            sectionTexts.add(processText(footer.getSearchableText(), footer.getTextBlocks(), "Footer", sectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
-            sectionTexts.add(processText(unclassifiedText.getSearchableText(), unclassifiedText.getTextBlocks(), "", sectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        return sectionTexts;
-    }
-
-
-    private List<SectionText> processTablePerRow(TablePageBlock table, AtomicInteger sectionNumber) {
-
-        List<SectionText> sectionTexts = new ArrayList<>();
-        boolean hasHeader = hasTableHeader(table);
-
-        for (List<Cell> row : table.getRows()) {
-
-            List<ClassificationTextBlock> textBlocks = new ArrayList<>();
-            List<SectionArea> areas = new ArrayList<>();
-            Map<String, CellValue> tabularData = new HashMap<>();
-            List<Integer> startOffsets = new ArrayList<>();
-
-            int startOffset = 0;
-            for (int cellNum = 0; cellNum < row.size(); cellNum++) {
-
-                Cell cell = row.get(cellNum);
-                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                    continue;
-                }
-
-                SectionArea sectionArea = getSectionArea(cell);
-                areas.add(sectionArea);
-
-                if (!cell.isHeaderCell()) {
-                    String headerName = getHeaderName(hasHeader, cell, table.getRows().get(0), row.size(), cellNum);
-                    if (headerName != null) {
-                        sectionArea.setHeader(headerName);
-                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), startOffset));
-                    }
-                }
-
-                textBlocks.addAll(cell.getTextBlocks());
-
-                startOffsets.add(startOffset);
-                startOffset = startOffset + cell.toString().trim().length() + 1;
-            }
-
-            sectionTexts.add(SectionText.builder()
-                    .text(getRowText(textBlocks))
-                    .headline(table.getHeadline())
-                    .sectionNumber(sectionNumber.intValue())
-                    .isTable(true)
-                    .tabularData(tabularData)
-                    .cellStarts(startOffsets)
-                    .textBlocks(textBlocks)
-                    .sectionAreas(areas)
-                    .build());
-
-            sectionNumber.incrementAndGet();
-        }
-
-        return sectionTexts;
-    }
-
-
-    public String getRowText(List<ClassificationTextBlock> rowTextBlocks) {
-
-        return SearchableText.buildString(rowTextBlocks.stream().map(textBlock -> textBlock.getSequences()).flatMap(List::stream).collect(Collectors.toList()));
-    }
-
-
-    private boolean hasTableHeader(TablePageBlock table) {
-
-        return table.getRows().stream().anyMatch(row -> row.stream().anyMatch(cell -> !cell.isHeaderCell() && !cell.getHeaderCells().isEmpty()));
-    }
-
-
-    private SectionArea getSectionArea(Cell cell) {
-
-        return new SectionArea(new Point((float) cell.getX(), (float) cell.getY()),
-                (float) cell.getWidth(),
-                (float) cell.getHeight(),
-                cell.getTextBlocks().get(0).getSequences().get(0).getPage(),
-                null);
-    }
-
-
-    private String getHeaderName(boolean hasHeader, Cell currentCell, List<Cell> firstRow, int currentRowSize, int cellNum) {
-
-        if (hasHeader && !currentCell.getHeaderCells().isEmpty()) {
-            return buildHeaderName(currentCell.getHeaderCells().get(currentCell.getHeaderCells().size() - 1));
-        }
-
-        if (!hasHeader && currentRowSize == firstRow.size() && currentCell != firstRow.get(cellNum)) {
-            return buildHeaderName(firstRow.get(cellNum));
-        }
-
-        return null;
-    }
-
-
-    private String buildHeaderName(Cell cell) {
-
-        StringBuilder headerBuilder = new StringBuilder();
-        cell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-        return headerBuilder.toString().replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
-    }
-
-
-    private SectionText processText(SearchableText searchableText,
-                                    List<ClassificationTextBlock> paragraphTextBlocks,
-                                    String headline,
-                                    AtomicInteger sectionNumber,
-                                    List<ClassifiedImage> images) {
-
-        SectionText sectionText = new SectionText();
-        for (ClassificationTextBlock paragraphTextBlock : paragraphTextBlocks) {
-            SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()),
-                    paragraphTextBlock.getWidth(),
-                    paragraphTextBlock.getHeight(),
-                    paragraphTextBlock.getPage(),
-                    null);
-            sectionText.getSectionAreas().add(sectionArea);
-        }
-
-        sectionText.setText(searchableText.asString());
-        sectionText.setHeadline(headline);
-        sectionText.setSectionNumber(sectionNumber.intValue());
-        sectionText.setTable(false);
-        sectionText.setImages(images.stream().map(image -> convertImage(image, sectionNumber.intValue(), headline)).collect(Collectors.toSet()));
-        sectionText.setTextBlocks(paragraphTextBlocks);
-        return sectionText;
-    }
-
-
-    private Image convertImage(ClassifiedImage classifiedImage, int sectionNumber, String headline) {
-
-        return Image.builder()
-                .type(classifiedImage.getImageType().equals(ImageType.OTHER) ? "image" : classifiedImage.getImageType().name().toLowerCase(Locale.ROOT))
-                .position(classifiedImage.getPosition())
-                .sectionNumber(sectionNumber)
-                .section(headline)
-                .page(classifiedImage.getPage())
-                .hasTransparency(classifiedImage.isHasTransparency())
-                .build();
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SurroundingWordsService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SurroundingWordsService.java
deleted file mode 100644
index 726c9eb9..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/SurroundingWordsService.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.List;
-import java.util.Set;
-
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-
-import io.micrometer.core.annotation.Timed;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@UtilityClass
-public class SurroundingWordsService {
-
-    @Timed("redactmanager_addSurroundingText")
-    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary, int surroundingWordsOffsetWindow, int numberOfSurroundingWords) {
-
-        if (entities.isEmpty()) {
-            return;
-        }
-
-        try {
-            for (Entity entity : entities) {
-
-                if (dictionary != null && dictionary.isHint(entity.getType())) {
-                    continue;
-                }
-                findSurroundingWords(entity, searchableText.asString(), entity.getStart(), entity.getEnd(), surroundingWordsOffsetWindow, numberOfSurroundingWords);
-            }
-        } catch (Exception e) {
-            log.warn("Could not get surrounding text!");
-        }
-    }
-
-
-    @Timed("redactmanager_addSurroundingTextTables")
-    public void addSurroundingText(Set<Entity> entities,
-                                   SearchableText searchableText,
-                                   Dictionary dictionary,
-                                   List<Integer> cellstarts,
-                                   int surroundingWordsOffsetWindow,
-                                   int numberOfSurroundingWords) {
-
-        if (entities.isEmpty()) {
-            return;
-        }
-
-        try {
-            String searchableString = searchableText.asString();
-
-            if (cellstarts != null) {
-                for (int i = 0; i < cellstarts.size(); i++) {
-
-                    int startOffset = cellstarts.get(i);
-                    int endOffset = -1;
-
-                    if (i + 1 < cellstarts.size()) {
-                        endOffset = cellstarts.get(i + 1);
-                    } else {
-                        endOffset = searchableString.length() - 1;
-                    }
-
-                    String text = searchableString.substring(startOffset, endOffset);
-                    for (Entity entity : entities) {
-
-                        if (dictionary != null && dictionary.isHint(entity.getType())) {
-                            continue;
-                        }
-
-                        if (entity.getStart() >= startOffset && entity.getEnd() <= endOffset) {
-                            int entityStartOffset = entity.getStart() - startOffset;
-                            int entityEndOffset = entity.getEnd() - startOffset;
-                            findSurroundingWords(entity, text, entityStartOffset, entityEndOffset, surroundingWordsOffsetWindow, numberOfSurroundingWords);
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Could not get surrounding text!");
-        }
-    }
-
-
-    private void findSurroundingWords(Entity entity, String text, int entityStartOffset, int entityEndOffset, int surroundingWordsOffsetWindow, int numberOfSurroundingWords) {
-
-        int offsetBefore = entityStartOffset - surroundingWordsOffsetWindow < 0 ? 0 : entityStartOffset - surroundingWordsOffsetWindow;
-        String textBefore = text.substring(offsetBefore, entityStartOffset);
-        if (!textBefore.isBlank()) {
-            String[] wordsBefore = textBefore.split(" ");
-            int numberOfWordsBefore = wordsBefore.length > numberOfSurroundingWords ? numberOfSurroundingWords : wordsBefore.length;
-            if (wordsBefore.length > 0) {
-                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore, textBefore.endsWith(" ")));
-            }
-        }
-
-        int endOffset = entityEndOffset + surroundingWordsOffsetWindow > text.length() ? text.length() : entityEndOffset + surroundingWordsOffsetWindow;
-        String textAfter = text.substring(entityEndOffset, endOffset);
-        if (!textAfter.isBlank()) {
-            String[] wordsAfter = textAfter.split(" ");
-            int numberOfWordsAfter = wordsAfter.length > numberOfSurroundingWords ? numberOfSurroundingWords : wordsAfter.length;
-            if (wordsAfter.length > 0) {
-                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter, textAfter.startsWith(" ")));
-            }
-        }
-    }
-
-
-    private String concatWordsBefore(String[] words, int number, boolean endWithSpace) {
-
-        StringBuilder sb = new StringBuilder();
-
-        int startNumber = words.length > number ? words.length - number : 0;
-
-        for (int i = startNumber; i < words.length; i++) {
-            sb.append(words[i]).append(" ");
-        }
-
-        String result = sb.toString().trim();
-        return endWithSpace ? result + " " : result;
-    }
-
-
-    private String concatWordsAfter(String[] words, int number, boolean startWithSpace) {
-
-        StringBuilder sb = new StringBuilder();
-
-        for (int i = 0; i < number; i++) {
-            sb.append(words[i]).append(" ");
-        }
-
-        String result = sb.toString().trim();
-        return startWithSpace ? " " + result : result;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityFinder.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityFinder.java
deleted file mode 100644
index c318ec31..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityFinder.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service.entityredaction;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
-import io.micrometer.core.annotation.Timed;
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-class EntityFinder {
-
-    RedactionServiceSettings redactionServiceSettings;
-
-
-    @Timed("redactmanager_findEntities")
-    public Entities findEntities(SearchableText searchableText,
-                                 String headline,
-                                 int sectionNumber,
-                                 Dictionary dictionary,
-                                 boolean local,
-                                 NerEntitiesModel nerEntitiesModel,
-                                 List<Integer> cellStarts,
-                                 ManualRedactions manualRedactions) {
-
-        Set<Entity> found = new HashSet<>();
-        String searchableString = searchableText.asString();
-
-        if (StringUtils.isEmpty(searchableString)) {
-            return new Entities(new HashSet<>(), new HashSet<>());
-        }
-
-        String lowercaseInputString = searchableString.toLowerCase();
-        for (DictionaryModel model : dictionary.getDictionaryModels()) {
-
-            var searchImplementation = local ? model.getLocalSearch() : model.getEntriesSearch();
-            var entities = EntitySearchUtils.findEntities(model.isCaseInsensitive() ? lowercaseInputString : searchableString,
-                    searchImplementation,
-                    model,
-                    new FindEntityDetails(model.getType(),
-                            headline,
-                            sectionNumber,
-                            !local,
-                            model.isDossierDictionary(),
-                            local ? Engine.RULE : Engine.DICTIONARY,
-                            local ? EntityType.RECOMMENDATION : EntityType.ENTITY)).stream().filter(e -> !e.isFalsePositive()).collect(Collectors.toSet());
-
-            EntitySearchUtils.addOrAddEngine(found, entities);
-        }
-
-        Set<Entity> nerFound = new HashSet<>();
-        if (!local) {
-            nerFound.addAll(getNerValues(sectionNumber, nerEntitiesModel, cellStarts, headline));
-        }
-
-        var cleared = EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
-        return new Entities(cleared.stream().filter(e -> !e.isFalsePositive()).collect(Collectors.toSet()), nerFound);
-    }
-
-
-    private Set<Entity> getNerValues(int sectionNumber, NerEntitiesModel nerEntitiesModel, List<Integer> cellStarts, String headline) {
-
-        Set<Entity> entities = new HashSet<>();
-
-        if (redactionServiceSettings.isNerServiceEnabled() && nerEntitiesModel.getData().containsKey(sectionNumber)) {
-            nerEntitiesModel.getData().get(sectionNumber).forEach(res -> {
-                if (cellStarts == null || cellStarts.isEmpty()) {
-                    entities.add(new Entity(res.getValue(),
-                            res.getType(),
-                            res.getStartOffset(),
-                            res.getEndOffset(),
-                            headline,
-                            sectionNumber,
-                            false,
-                            false,
-                            Engine.NER,
-                            EntityType.RECOMMENDATION));
-                } else {
-                    boolean intersectsCellStart = false;
-                    for (Integer cellStart : cellStarts) {
-                        if (res.getStartOffset() < cellStart && cellStart < res.getEndOffset()) {
-                            intersectsCellStart = true;
-                            break;
-                        }
-                    }
-                    if (!intersectsCellStart) {
-                        entities.add(new Entity(res.getValue(),
-                                res.getType(),
-                                res.getStartOffset(),
-                                res.getEndOffset(),
-                                headline,
-                                sectionNumber,
-                                false,
-                                false,
-                                Engine.NER,
-                                EntityType.RECOMMENDATION));
-                    }
-                }
-            });
-        }
-        return entities;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java
deleted file mode 100644
index dab70c51..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtils.java
+++ /dev/null
@@ -1,385 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@UtilityClass
-@SuppressWarnings("PMD")
-public final class EntitySearchUtils {
-
-    public boolean sectionContainsAny(String sectionText, SearchImplementation searchImplementation) {
-
-        return searchImplementation.atLeastOneMatches(sectionText);
-    }
-
-
-    public void removeFalsePositives(Set<Entity> found, String inputString, DictionaryModel type, FindEntityDetails details) {
-
-        Set<Entity> falsePositives = find(inputString, type.getFalsePositiveSearch(), details.withEntityType(EntityType.FALSE_POSITIVE));
-        markFalsePositives(found, falsePositives);
-        found.removeIf(Entity::isFalsePositive);
-    }
-
-
-    public Set<Entity> findEntities(String inputString, SearchImplementation searchImplementation, DictionaryModel type, FindEntityDetails details) {
-
-        Set<Entity> found = find(inputString, searchImplementation, details);
-
-        if (details.getEntityType() == EntityType.RECOMMENDATION) {
-            Set<Entity> falseRecommendations = find(inputString, type.getFalseRecommendationsSearch(), details.withEntityType(EntityType.FALSE_RECOMMENDATION));
-            markFalsePositives(found, falseRecommendations);
-        } else {
-            Set<Entity> falsePositives = find(inputString, type.getFalsePositiveSearch(), details.withEntityType(EntityType.FALSE_POSITIVE));
-            markFalsePositives(found, falsePositives);
-        }
-
-        return found;
-    }
-
-
-    public Set<Entity> find(String inputString, SearchImplementation searchImplementation, FindEntityDetails findEntityDetails) {
-
-        Set<Entity> entities = new HashSet<>();
-
-        searchImplementation.getMatches(inputString).forEach(match -> validateAndAddEntity(entities, findEntityDetails, inputString, match.startIndex(), match.endIndex()));
-
-        return entities;
-    }
-
-
-    private void validateAndAddEntity(Set<Entity> entities, FindEntityDetails findEntityDetails, String inputString, int startIndex, int stopIndex) {
-
-        if ((startIndex == 0 || SeparatorUtils.isSeparator(inputString.charAt(startIndex - 1)) || SeparatorUtils.isSeparator(inputString.charAt(startIndex))) && (stopIndex == inputString.length() || SeparatorUtils.isSeparator(
-                inputString.charAt(stopIndex)) || SeparatorUtils.isSeparator(inputString.charAt(stopIndex - 1)))) {
-            entities.add(new Entity(inputString.substring(startIndex, stopIndex),
-                    findEntityDetails.getType(),
-                    startIndex,
-                    stopIndex,
-                    findEntityDetails.getHeadline(),
-                    findEntityDetails.getSectionNumber(),
-                    findEntityDetails.isDictionaryEntry(),
-                    findEntityDetails.isDossierDictionary(),
-                    findEntityDetails.getEngine(),
-                    findEntityDetails.getEntityType()));
-        }
-    }
-
-
-    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary, ManualRedactions manualRedactions) {
-
-        Map<String, List<Entity>> entitiesByWord = new HashMap<>();
-
-        for (Entity entity : entities) {
-            entitiesByWord.computeIfAbsent(entity.getWord(), (x) -> new ArrayList<>()).add(entity);
-        }
-
-        for (String word : entitiesByWord.keySet()) {
-
-            List<Entity> orderedEntities = entitiesByWord.get(word).stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
-            Entity firstEntity = orderedEntities.get(0);
-            List<EntityPositionSequence> positionSequences = text.getSequences(word.trim(),
-                    dictionary == null || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()),
-                    firstEntity.getTargetSequences());
-
-            Map<String, List<EntityPositionSequence>> multipartSequenceParts = new HashMap<>();
-            Iterator<EntityPositionSequence> itty = positionSequences.iterator();
-            while (itty.hasNext()) {
-                var positionSequence = itty.next();
-                if (positionSequence.getId().contains("-")) {
-                    multipartSequenceParts.computeIfAbsent(positionSequence.getId().split("-")[0], (x) -> new ArrayList<>()).add(positionSequence);
-                    itty.remove();
-                }
-            }
-
-            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
-                try {
-                    List<EntityPositionSequence> toAdd = new ArrayList<>();
-                    var currentSeq = positionSequences.get(i);
-                    toAdd.add(currentSeq);
-                    if (multipartSequenceParts.containsKey(currentSeq.getId())) {
-                        toAdd.addAll(multipartSequenceParts.get(currentSeq.getId()));
-                    }
-                    orderedEntities.get(i).setPositionSequences(toAdd);
-
-                } catch (Exception e) {
-                    //log.warn("Mismatch between EntityPositionSequence and found Entity!");
-                }
-            }
-        }
-
-        if (manualRedactions != null && manualRedactions.getResizeRedactions() != null && !manualRedactions.getResizeRedactions().isEmpty()) {
-            applyResizeRedactions(entities, manualRedactions);
-        }
-
-        removeEntitiesContainedInLarger(entities);
-
-        return entities;
-    }
-
-
-    private void applyResizeRedactions(Set<Entity> entitiesWithPositions, ManualRedactions manualRedactions) {
-
-        if (manualRedactions == null || manualRedactions.getResizeRedactions() == null || manualRedactions.getResizeRedactions().isEmpty()) {
-            return;
-        }
-
-        entitiesWithPositions.forEach(e -> e.getPositionSequences()
-                .forEach(pos -> manualRedactions.getResizeRedactions().stream().filter(resize -> resize.getStatus().equals(AnnotationStatus.APPROVED)).forEach(resize -> {
-                    if (resize.getAnnotationId().equals(pos.getId())) {
-                        if (resize.getValue().length() < e.getWord().length() && e.getWord().contains(resize.getValue())) {
-                            int start = e.getWord().indexOf(resize.getValue());
-                            e.setStart(e.getStart() + start);
-                            e.setEnd(e.getStart() + resize.getValue().length());
-                            e.setResized(true);
-                            e.setWord(resize.getValue());
-                        } else if (resize.getValue().length() > e.getWord().length() && resize.getValue().contains(e.getWord())) {
-                            int start = resize.getValue().indexOf(e.getWord());
-                            e.setStart(e.getStart() - start);
-                            e.setEnd(e.getStart() + resize.getValue().length());
-                            e.setResized(true);
-                            e.setWord(resize.getValue());
-                        }
-                    }
-                })));
-
-    }
-
-
-    public void markFalsePositives(Set<Entity> entities, Set<Entity> falsePositives) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        for (Entity word : falsePositives) {
-            for (Entity inner : entities) {
-                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word.getSectionNumber() == inner.getSectionNumber()) {
-                    wordsToRemove.add(inner);
-                }
-            }
-        }
-        wordsToRemove.forEach(e -> e.setFalsePositive(true));
-        for (var entity : entities) {
-            if (falsePositives.contains(entity)) {
-                entity.setFalsePositive(true);
-            }
-        }
-    }
-
-
-    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        for (Entity outer : entities) {
-            for (Entity inner : entities) {
-//                // skip cross-type false positives
-//                if(word.getEntityType() == EntityType.FALSE_POSITIVE && inner.getEntityType() == EntityType.ENTITY && !inner.getType().equals(word.getType())){
-//                    continue;
-//                }
-//                // skip cross-type false reccommendations
-//                if(word.getEntityType() == EntityType.FALSE_RECOMMENDATION && inner.getEntityType() == EntityType.RECOMMENDATION && !inner.getType().equals(word.getType())){
-//                    continue;
-//                }
-
-                if ((inner.isSkipRemoveEntitiesContainedInLarger() || outer.isSkipRemoveEntitiesContainedInLarger()) && !inner.getType().equals(outer.getType())) {
-                    continue;
-                }
-
-                if (inner.getWord().length() < outer.getWord()
-                        .length() && inner.getStart() >= outer.getStart() && inner.getEnd() <= outer.getEnd() && outer != inner && outer.getSectionNumber() == inner.getSectionNumber()) {
-                    if (outer.getEntityType().equals(EntityType.RECOMMENDATION) && inner.getEntityType().equals(EntityType.ENTITY)) {
-                        wordsToRemove.add(outer);
-                    } else if (!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && outer.getEntityType() == EntityType.ENTITY || inner.getEntityType() == EntityType.ENTITY && outer.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
-                        if (inner.isResized()) {
-                            wordsToRemove.add(outer);
-                        } else {
-                            wordsToRemove.add(inner);
-                        }
-                    }
-                }
-            }
-        }
-        wordsToRemove.stream()
-                .filter(e -> !e.getEntityType().equals(EntityType.FALSE_POSITIVE) && !e.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
-                .forEach(entities::remove);
-    }
-
-
-    public static void removeEntitiesContainedInRedactedLogos(Map<Integer, Set<Image>> imagesPerPage, Map<Integer, List<Entity>> entitiesPerPage) {
-
-        if (entitiesPerPage != null && imagesPerPage != null) {
-            for (int page : imagesPerPage.keySet()) {
-                Set<Entity> removeEntitiesFromPage = new HashSet<>();
-
-                if (!entitiesPerPage.containsKey(page)) {
-                    continue;
-                }
-                imagesPerPage.get(page).forEach(image -> {
-                    if (image.isRedaction()) {
-                        entitiesPerPage.get(page).forEach(entity -> {
-                            if (isImageOverlappingEntity(image, entity)) {
-                                log.info("Logo overlaps entity and entity will be removed");
-                                removeEntitiesFromPage.add(entity);
-                            }
-
-                        });
-                    }
-                });
-
-                entitiesPerPage.get(page).removeAll(removeEntitiesFromPage);
-
-            }
-        }
-    }
-
-
-    public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
-
-        found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
-    }
-
-
-    public void addEntitiesWithHigherRank(Set<Entity> entities, Entity found, Dictionary dictionary) {
-
-        if (entities.contains(found)) {
-            Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
-            if (existingOptional.isEmpty()) {
-                return;
-            }
-            var existing = existingOptional.get();
-
-            if (existing.getType().equals(found.getType())) {
-                existing.getEngines().addAll(found.getEngines());
-                existing.setLegalBasis(found.getLegalBasis());
-                existing.setMatchedRule(found.getMatchedRule());
-                existing.setRedactionReason(found.getRedactionReason());
-                if (isOneARecommendationAndTheOtherEntity(found, existing)) {
-                    existing.setEntityType(EntityType.ENTITY);
-                    if (found.isRedaction()) {
-                        existing.setRedaction(true);
-                    }
-                }
-            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType()) &&
-                    !(isOneARecommendationAndTheOtherEntity(found, existing) && existing.isRedaction() && found.isRedaction()) ) {
-                entities.remove(found);
-                entities.add(found);
-            }
-        } else {
-            entities.add(found);
-        }
-    }
-
-    private boolean isOneARecommendationAndTheOtherEntity(Entity entityOne, Entity entityTwo) {
-
-        var entityTypeOne = entityOne.getEntityType();
-        var entityTypeTwo = entityTwo.getEntityType();
-        return entityTypeTwo.equals(EntityType.RECOMMENDATION) && entityTypeOne.equals(EntityType.ENTITY)
-                || entityTypeTwo.equals(EntityType.ENTITY) && entityTypeOne.equals(EntityType.RECOMMENDATION);
-    }
-
-    public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found) {
-        // HashSet keeps old value but we want the new.
-        entities.removeAll(found);
-        entities.addAll(found);
-    }
-
-
-    private boolean isImageOverlappingEntity(Image image, Entity entity) {
-
-        return image.getPosition() != null && entity.getPositionSequences() != null && entity.getPositionSequences().get(0) != null && entity.getPositionSequences()
-                .get(0)
-                .getSequences() != null && entity.getPositionSequences().get(0).getSequences().get(0) != null && image.getPosition().getX() < entity.getPositionSequences()
-                .get(0)
-                .getSequences()
-                .get(0)
-                .getMinXDirAdj() && image.getPosition().getX() + image.getPosition().getWidth() > entity.getPositionSequences()
-                .get(0)
-                .getSequences()
-                .get(0)
-                .getMaxXDirAdj() && image.getPosition().getY() < entity.getPositionSequences().get(0).getSequences().get(0).getMinYDirAdj() && image.getPosition()
-                .getY() + image.getPosition().getHeight() > entity.getPositionSequences().get(0).getSequences().get(0).getMaxYDirAdj();
-    }
-
-
-    public Set<Entity> findNonOverlappingMatchEntities(Set<Entity> existingEntities, Set<Entity> foundEntities) {
-
-        Set<Entity> result = new HashSet<>();
-        if (existingEntities != null && foundEntities != null) {
-            for (Entity foundEntity : foundEntities) {
-
-                if (!overlaps(existingEntities, foundEntity)) {
-                    result.add(foundEntity);
-                }
-
-            }
-        }
-        return result;
-    }
-
-
-    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
-
-        for (Entity toAdd : toBeAdded) {
-            if (existing.contains(toAdd)) {
-                Optional<Entity> existingOptional = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
-                if (existingOptional.isEmpty()) {
-                    return;
-                }
-                var existingEntity = existingOptional.get();
-                existingEntity.getEngines().addAll(toAdd.getEngines());
-                existingEntity.setLegalBasis(toAdd.getLegalBasis());
-                existingEntity.setMatchedRule(toAdd.getMatchedRule());
-                existingEntity.setRedactionReason(toAdd.getRedactionReason());
-            } else {
-                existing.add(toAdd);
-            }
-        }
-    }
-
-
-    /*
-     * returns true if the found entity overlaps with an existing entity in a way
-     * that neither entity is a subset of the other
-     */
-    private boolean overlaps(Set<Entity> existingEntities, Entity found) {
-
-        for (Entity existing : existingEntities) {
-
-            // skip if either start or end is equal
-            if (existing.getStart().equals(found.getStart()) || existing.getEnd().equals(found.getEnd())) {
-                continue;
-            }
-
-            for (int i = existing.getStart(); i <= existing.getEnd(); i++) {
-                for (int j = found.getStart(); j <= found.getEnd(); j++) {
-                    if (i == j) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/FindEntityDetails.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/FindEntityDetails.java
deleted file mode 100644
index f5d63359..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/FindEntityDetails.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class FindEntityDetails {
-
-    private String type;
-    private String headline;
-    private int sectionNumber;
-    private boolean isDictionaryEntry;
-    private boolean isDossierDictionary;
-    private Engine engine;
-    private EntityType entityType;
-
-
-    public FindEntityDetails withEntityType(EntityType entityType) {
-
-        this.entityType = entityType;
-        return this;
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java
index 4ee7e938..0a297c67 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java
@@ -7,9 +7,7 @@ import java.util.Set;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 
 import lombok.experimental.UtilityClass;
 
@@ -19,18 +17,7 @@ public final class IdBuilder {
     private final HashFunction hashFunction = Hashing.murmur3_128();
 
 
-    public String buildId(List<TextPositionSequence> crossSequenceParts) {
-
-        StringBuilder sb = new StringBuilder();
-        crossSequenceParts.forEach(sequencePart -> sequencePart.getTextPositions().forEach(textPosition -> {
-            sb.append(textPosition.getTextMatrix()).append(sequencePart.getPage());
-        }));
-
-        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
-    }
-
-
-    public String buildId(Set<PageNode> pages, List<Rectangle2D> rectanglesPerLine) {
+    public String buildId(Set<Page> pages, List<Rectangle2D> rectanglesPerLine) {
 
         StringBuilder sb = new StringBuilder();
         pages.forEach(pageNode -> sb.append(pageNode.getNumber()));
@@ -39,24 +26,4 @@ public final class IdBuilder {
         return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
     }
 
-
-    public String buildId(Rectangle2D rectangle2D, int page) {
-
-        return hashFunction.hashString("x" + rectangle2D.getX() + "y" + rectangle2D.getY() + "h" + rectangle2D.getHeight() + "w" + rectangle2D.getWidth() + "p" + page,
-                StandardCharsets.UTF_8).toString();
-    }
-
-
-    public String buildId(RedRectangle2D rectangle2D, int page) {
-
-        return hashFunction.hashString("x" + rectangle2D.getX() + "y" + rectangle2D.getY() + "h" + rectangle2D.getHeight() + "w" + rectangle2D.getWidth() + "p" + page,
-                StandardCharsets.UTF_8).toString();
-    }
-
-
-    public String getTypeId(String type, String dossierTemplateId, String dossierId) {
-
-        return type + ":" + dossierTemplateId + (dossierId != null ? ":" + dossierId : "");
-    }
-
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/OffsetStringUtils.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/OffsetStringUtils.java
deleted file mode 100644
index 66f53bbd..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/OffsetStringUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.iqser.red.service.redaction.v1.server.redaction.model.OffsetString;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public final class OffsetStringUtils {
-
-    /**
-     * Same logic as in StringUtils.redactBetween, but returns a list of object with offsets insteadof on the Strings only.
-     *
-     * @param str – the String containing the substrings, null returns null, empty returns empty
-     * @param open – the String identifying the startIdx of the substring, empty returns null
-     * @param close – the String identifying the endIdx of the substring, empty returns null
-     * @return a list of Strings with their offsets
-     */
-    public List<OffsetString> substringsBetween(final String str, final String open, final String close) {
-
-        if (str == null || StringUtils.isEmpty(open) || StringUtils.isEmpty(close)) {
-            return null;
-        }
-        final int strLen = str.length();
-        if (strLen == 0) {
-            return new ArrayList<>();
-        }
-        final int closeLen = close.length();
-        final int openLen = open.length();
-        final List<OffsetString> list = new ArrayList<>();
-        int pos = 0;
-        while (pos < strLen - closeLen) {
-            int start = str.indexOf(open, pos);
-            if (start < 0) {
-                break;
-            }
-            start += openLen;
-            final int end = str.indexOf(close, start);
-            if (end < 0) {
-                break;
-            }
-            list.add(new OffsetString(str.substring(start, end), start, end));
-            pos = end + closeLen;
-        }
-        if (list.isEmpty()) {
-            return null;
-        }
-        return list;
-    }
-
-}
-
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
index 80c447bb..535f9b1e 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
@@ -10,7 +10,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
 import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.Text;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentData;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
@@ -72,32 +71,20 @@ public class RedactionStorageService {
         try {
             return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG), RedactionLog.class);
         } catch (StorageObjectDoesNotExist e) {
-            log.debug("Text not available.");
+            log.debug("RedactionLog not available.");
             return null;
         }
 
     }
 
 
-    @Timed("redactmanager_getText")
-    public Text getText(String dossierId, String fileId) {
-
-        try {
-            return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT), Text.class);
-        } catch (StorageObjectDoesNotExist e) {
-            log.debug("Text not available.");
-            return null;
-        }
-    }
-
-
     @Timed("redactmanager_getDocumentGraph")
     public DocumentData getDocumentData(String dossierId, String fileId) {
 
         try {
             return storageService.readJSONObject(TenantContext.getTenantId(), StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT), DocumentData.class);
         } catch (StorageObjectDoesNotExist e) {
-            log.debug("Text not available.");
+            log.debug("DocumentData not available.");
             return null;
         }
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfDraw.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfDraw.java
index ebd3e6ef..4da167c8 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfDraw.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfDraw.java
@@ -12,10 +12,10 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.AtomicTextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RectangleTransformations;
@@ -30,13 +30,13 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public class PdfDraw {
 
-    public static void drawDocumentGraph(PDDocument document, DocumentGraph documentGraph) {
+    public static void drawDocumentGraph(PDDocument document, Document documentGraph) {
 
-        documentGraph.getTableOfContents().streamAllEntriesInOrder().forEach(entry -> drawNode(document, entry));
+        documentGraph.getDocumentTree().streamAllEntriesInOrder().forEach(entry -> drawNode(document, entry));
     }
 
 
-    public static void drawNode(PDDocument document, TableOfContents.Entry entry) {
+    public static void drawNode(PDDocument document, DocumentTree.Entry entry) {
 
         Options options = buildStandardOptionsForNodes(entry);
 
@@ -124,7 +124,7 @@ public class PdfDraw {
     }
 
 
-    private static Options buildStandardOptionsForNodes(TableOfContents.Entry entry) {
+    private static Options buildStandardOptionsForNodes(DocumentTree.Entry entry) {
 
         return Options.builder().stroke(true).strokeColor(switch (entry.getType()) {
             case DOCUMENT -> Color.LIGHT_GRAY;
@@ -139,9 +139,9 @@ public class PdfDraw {
     }
 
 
-    private static void drawBBoxAndLabelAndNumberOnPage(PDDocument document, TableOfContents.Entry entry, Options options) {
+    private static void drawBBoxAndLabelAndNumberOnPage(PDDocument document, DocumentTree.Entry entry, Options options) {
 
-        Map<PageNode, Rectangle2D> rectanglesPerPage = entry.getNode().getBBox();
+        Map<Page, Rectangle2D> rectanglesPerPage = entry.getNode().getBBox();
         rectanglesPerPage.forEach((page, rectangle2D) -> {
             Rectangle2D paddedRectangle2D = rectangle2D;
             if (entry.getType() == NodeType.SECTION) {
@@ -153,7 +153,7 @@ public class PdfDraw {
     }
 
 
-    private static String buildString(TableOfContents.Entry entry) {
+    private static String buildString(DocumentTree.Entry entry) {
 
         return entry.getNode().getNumberOnPage() + ": " + entry.getTocId() + ": " + entry.getType().toString();
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java
index e0cdf473..e4792875 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/PdfVisualisationService.java
@@ -11,9 +11,9 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Section;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationSection;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.ClassificationTextBlock;
@@ -30,14 +30,14 @@ public class PdfVisualisationService {
     private static final boolean DRAW_POSITIONS = false;
 
 
-    public void visualizeParagraphs(Document classifiedDoc, PDDocument document) throws IOException {
+    public void visualizeParagraphs(ClassificationDocument classifiedDoc, PDDocument document) throws IOException {
 
         for (int page = 1; page <= document.getNumberOfPages(); page++) {
 
             PDPage pdPage = document.getPage(page - 1);
             PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
 
-            for (Section paragraph : classifiedDoc.getSections()) {
+            for (ClassificationSection paragraph : classifiedDoc.getSections()) {
 
                 for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
 
@@ -62,11 +62,11 @@ public class PdfVisualisationService {
     }
 
 
-    public void visualizeClassifications(Document classifiedDoc, PDDocument document) throws IOException {
+    public void visualizeClassifications(ClassificationDocument classifiedDoc, PDDocument document) throws IOException {
 
         for (int page = 1; page <= document.getNumberOfPages(); page++) {
 
-            Page analyzedPage = classifiedDoc.getPages().get(page - 1);
+            ClassificationPage analyzedPage = classifiedDoc.getPages().get(page - 1);
 
             PDPage pdPage = document.getPage(page - 1);
             PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java
index 287309ee..76952f37 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java
@@ -36,8 +36,8 @@ import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.analyze.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
@@ -240,7 +240,7 @@ public abstract class AbstractRedactionIntegrationTest {
 
         URL resource = ResourceLoader.class.getClassLoader().getResource(path);
         if (resource == null) {
-            throw new IllegalArgumentException("could not load classpath resource: drools/prod_rules_new.drl");
+            throw new IllegalArgumentException("could not load classpath resource:" + path);
         }
         List<String> stringList = Files.readAllLines(new File(resource.getPath()).toPath());
         return String.join("\n", stringList);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumentGraphPerformanceIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumentPerformanceIntegrationTest.java
similarity index 92%
rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumentGraphPerformanceIntegrationTest.java
rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumentPerformanceIntegrationTest.java
index 04f0ebf6..1cee6bf3 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumentGraphPerformanceIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumentPerformanceIntegrationTest.java
@@ -32,17 +32,17 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
-import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentGraphIntegrationTest;
+import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentIntegrationTest;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
@@ -52,8 +52,8 @@ import com.iqser.red.service.redaction.v1.server.visualization.service.PdfDraw;
 
 import lombok.SneakyThrows;
 
-@Import(DocumentGraphPerformanceIntegrationTest.TestConfiguration.class)
-public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphIntegrationTest {
+@Import(DocumentPerformanceIntegrationTest.TestConfiguration.class)
+public class DocumentPerformanceIntegrationTest extends BuildDocumentIntegrationTest {
 
     private static final String RULES = "drools/rules.drl";
 
@@ -71,7 +71,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
     private KieContainer kieContainer;
 
     @Configuration
-    @Import(BuildDocumentGraphIntegrationTest.TestConfiguration.class)
+    @Import(BuildDocumentIntegrationTest.TestConfiguration.class)
     public static class TestConfiguration {
 
         @Bean
@@ -128,7 +128,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
     public void testDroolsOnDocumentGraph() {
 
         String filename = "files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06";
-        DocumentGraph document = buildGraph(filename);
+        Document document = buildGraph(filename);
 
         dictionaryService.updateDictionary(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID);
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID);
@@ -168,7 +168,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
 
         int n = 10000;
         String filename = "files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06";
-        DocumentGraph document = buildGraph(filename);
+        Document document = buildGraph(filename);
         var start = System.currentTimeMillis();
         for (int i = 0; i < n; i++) {
             TextBlock textBlock = document.getTextBlock();
@@ -176,7 +176,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
         float durationMillis = ((float) (System.currentTimeMillis() - start));
         System.out.printf("%d calls of buildTextBlock() on document took %f s, average is %f ms\n", n, durationMillis / 1000, durationMillis / n);
 
-        SectionNode section = document.getMainSections().get(8);
+        Section section = document.getMainSections().get(8);
         start = System.currentTimeMillis();
         for (int i = 0; i < n; i++) {
             section.buildTextBlock();
@@ -184,7 +184,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
         durationMillis = ((float) (System.currentTimeMillis() - start));
         System.out.printf("%d calls of buildTextBlock() on section took %f s, average is %f ms\n", n, durationMillis / 1000, durationMillis / n);
 
-        SemanticNode paragraph = document.getTableOfContents().getEntryById(List.of(8, 1)).getNode();
+        SemanticNode paragraph = document.getDocumentTree().getEntryById(List.of(8, 1)).getNode();
         start = System.currentTimeMillis();
         for (int i = 0; i < n; i++) {
             paragraph.buildTextBlock();
@@ -199,7 +199,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
     public void testDictionarySearchOnDocumentGraph() {
 
         String filename = "files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06";
-        DocumentGraph document = buildGraph(filename);
+        Document document = buildGraph(filename);
 
         dictionaryService.updateDictionary(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID);
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID);
@@ -227,7 +227,7 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
             totalSearchTime += searchTime;
 
             var insertStart = System.currentTimeMillis();
-            DocumentGraph finalDocument = document;
+            Document finalDocument = document;
             foundEntities.forEach(entity -> entityCreationService.addEntityToGraph(entity, finalDocument));
             var insertTime = System.currentTimeMillis() - insertStart;
             totalInsertTime += insertTime;
@@ -245,20 +245,20 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
     }
 
 
-    private static void drawAllEntities(String filename, DocumentGraph document) throws IOException {
+    private static void drawAllEntities(String filename, Document document) throws IOException {
 
         var tmpFileName = "/tmp/" + filename.split("/")[2] + "_ENTITY_BBOX.pdf";
         var fileResource = new ClassPathResource(filename + ".pdf");
         try (var fileStream = fileResource.getInputStream()) {
             PDDocument pdDocument = PDDocument.load(fileStream);
 
-            for (PageNode page : document.getPages()) {
+            for (Page page : document.getPages()) {
                 List<Rectangle2D> entityPositionsOnPage = page.getEntities()
                         .stream()
                         .filter(entityNode -> !entityNode.isRemoved())
                         .filter(RedactionEntity::isRedaction)
                         .flatMap(entityNode -> entityNode.getRedactionPositionsPerPage().stream())
-                        .filter(entityPosition -> entityPosition.getPageNode().equals(page))
+                        .filter(entityPosition -> entityPosition.getPage().equals(page))
                         .flatMap(entityPosition -> entityPosition.getRectanglePerLine().stream())
                         .toList();
 
@@ -266,13 +266,13 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
                 drawRectangle2DList(pdDocument, page.getNumber(), entityPositionsOnPage, options);
             }
 
-            for (PageNode page : document.getPages()) {
+            for (Page page : document.getPages()) {
                 List<Rectangle2D> entityPositionsOnPage = page.getEntities()
                         .stream()
                         .filter(entityNode -> !entityNode.isRemoved())
                         .filter(entityNode -> !entityNode.isRedaction())
                         .flatMap(entityNode -> entityNode.getRedactionPositionsPerPage().stream())
-                        .filter(entityPosition -> entityPosition.getPageNode().equals(page))
+                        .filter(entityPosition -> entityPosition.getPage().equals(page))
                         .flatMap(entityPosition -> entityPosition.getRectanglePerLine().stream())
                         .toList();
 
@@ -286,13 +286,13 @@ public class DocumentGraphPerformanceIntegrationTest extends BuildDocumentGraphI
     }
 
 
-    private void findEntitiesWithSearchImplementation(DocumentGraph documentGraph,
+    private void findEntitiesWithSearchImplementation(Document document,
                                                       SearchImplementation searchImplementation,
                                                       EntityType entityType,
                                                       List<RedactionEntity> foundEntities,
                                                       String type) {
 
-        TextBlock textBlock = documentGraph.getTextBlock();
+        TextBlock textBlock = document.getTextBlock();
         searchImplementation.getBoundaries(textBlock, textBlock.getBoundary())
                 .stream()
                 .filter(boundary -> boundaryIsSurroundedBySeparators(textBlock, boundary))
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java
index e5986e9d..cc486895 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/HeadlinesGoldStandardIntegrationTest.java
@@ -34,7 +34,7 @@ import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentGraphMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
-import com.iqser.red.service.redaction.v1.server.redaction.service.analyze.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
index a78674ad..b0721927 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
@@ -65,13 +65,13 @@ import com.iqser.red.service.redaction.v1.server.annotate.AnnotateRequest;
 import com.iqser.red.service.redaction.v1.server.annotate.AnnotateResponse;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentGraphMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Section;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RectangleMapper;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.OsUtils;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
@@ -218,7 +218,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
     @Test
     public void titleExtraction() throws IOException {
 
-        AnalyzeRequest request = uploadFileToStorage("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
+        AnalyzeRequest request = uploadFileToStorage("files/new/crafted document.pdf");
         System.out.println("Start Full integration test");
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         System.out.println("Finished structure analysis");
@@ -338,7 +338,8 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
 
 
     @Test
-    @Disabled // TODO: this is already broken on master, no idea how to fix it. Most likely more responses need to be stubbed.
+    @Disabled
+    // TODO: this is already broken on master, no idea how to fix it. Most likely more responses need to be stubbed.
     public void redactionTestSeparatedRedaction() throws IOException {
 
         String fileName = "scanned/VV-380943_page38.pdf";
@@ -366,18 +367,18 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
         System.out.println("first analysis duration: " + (end - start));
 
         try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Test.json")) {
-            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
+            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getDocumentData(TEST_DOSSIER_ID, TEST_FILE_ID)));
         }
 
         int correctFound = 0;
         loop:
         for (RedactionLogEntry redactionLogEntry : redactionLog.getRedactionLogEntry()) {
-            for (SectionNode section : documentGraph.getMainSections()) {
+            for (Section section : documentGraph.getMainSections()) {
                 if (redactionLogEntry.isImage()) {
                     correctFound++;
                     continue loop;
                 }
-                if (redactionLogEntry.getSectionNumber() == section.getTocId().get(0)) {
+                if (redactionLogEntry.getSectionNumber() == section.getTreeId().get(0)) {
                     String value = section.buildTextBlock().subSequence(new Boundary(redactionLogEntry.getStartOffset(), redactionLogEntry.getEndOffset())).toString();
                     if (redactionLogEntry.getValue().equalsIgnoreCase(value)) {
                         correctFound++;
@@ -520,7 +521,7 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
         System.out.println("first analysis duration: " + (end - start));
 
         try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Test.json")) {
-            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID)));
+            fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getDocumentData(TEST_DOSSIER_ID, TEST_FILE_ID)));
         }
 
         List<String> valuesInDocument = redactionLog.getRedactionLogEntry()
@@ -693,9 +694,9 @@ public class RedactionIntegrationTest extends AbstractRedactionIntegrationTest {
         assertTrue(redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.getValue().equals("Desiree et al")));
         assertTrue(redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.getValue().equals("Melanie et al.")));
 
-        DocumentGraph documentGraph = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(TEST_DOSSIER_ID, TEST_FILE_ID));
+        Document document = DocumentGraphMapper.toDocumentGraph(redactionStorageService.getDocumentData(TEST_DOSSIER_ID, TEST_FILE_ID));
         String expandedEntityKeyword = "Lorem ipsum dolor sit amet, consectetur adipiscing elit Desiree et al sed do eiusmod tempor incididunt ut labore et dolore magna aliqua Melanie et al. Reference No 12345 Lorem ipsum.";
-        RedactionEntity expandedEntity = entityCreationService.byString(expandedEntityKeyword, "PII", EntityType.ENTITY, documentGraph).findFirst().get();
+        RedactionEntity expandedEntity = entityCreationService.byString(expandedEntityKeyword, "PII", EntityType.ENTITY, document).findFirst().get();
 
         String idToResize = redactionLog.getRedactionLogEntry().stream().filter(entry -> entry.getValue().equals("Desiree et al")).findFirst().get().getId();
         List<Rectangle> resizedPositions = expandedEntity.getRedactionPositionsPerPage()
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java
index f95bc893..e88a031b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RulesTest.java
@@ -78,8 +78,8 @@ import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.analyze.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
@@ -95,7 +95,7 @@ import lombok.extern.slf4j.Slf4j;
 @Import(RulesTest.RulesTestConfiguration.class)
 public class RulesTest {
 
-    private static final String RULES_PATH = "drools/prod_rules_new.drl";
+    private static final String RULES_PATH = "drools/prod_syngenta_new.drl";
     private static final String RULES = loadFromClassPath(RULES_PATH);
     private static final String VERTEBRATE = "vertebrate";
     private static final String ADDRESS = "CBI_address";
@@ -797,7 +797,7 @@ public class RulesTest {
 
         URL resource = ResourceLoader.class.getClassLoader().getResource(path);
         if (resource == null) {
-            throw new IllegalArgumentException("could not load classpath resource: drools/prod_rules_new.drl");
+            throw new IllegalArgumentException("could not load classpath resource: " + path);
         }
         try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
             StringBuilder sb = new StringBuilder();
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/BuildDocumentGraphIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/BuildDocumentIntegrationTest.java
similarity index 86%
rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/BuildDocumentGraphIntegrationTest.java
rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/BuildDocumentIntegrationTest.java
index c8bf69ad..d90b30d2 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/BuildDocumentGraphIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/BuildDocumentIntegrationTest.java
@@ -23,11 +23,11 @@ import com.iqser.red.service.redaction.v1.server.AbstractRedactionIntegrationTes
 import com.iqser.red.service.redaction.v1.server.Application;
 import com.iqser.red.service.redaction.v1.server.FileSystemBackedStorageService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.ImageServiceResponseAdapter;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.factory.DocumentGraphFactory;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
 
@@ -35,8 +35,8 @@ import lombok.SneakyThrows;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Import(BuildDocumentGraphIntegrationTest.TestConfiguration.class)
-public class BuildDocumentGraphIntegrationTest extends AbstractRedactionIntegrationTest {
+@Import(BuildDocumentIntegrationTest.TestConfiguration.class)
+public class BuildDocumentIntegrationTest extends AbstractRedactionIntegrationTest {
 
     @Configuration
     @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
@@ -60,7 +60,7 @@ public class BuildDocumentGraphIntegrationTest extends AbstractRedactionIntegrat
 
 
     @SneakyThrows
-    protected DocumentGraph buildGraph(String filename) {
+    protected Document buildGraph(String filename) {
 
         if (!filename.endsWith(".pdf")) {
             filename = filename + ".pdf";
@@ -74,14 +74,14 @@ public class BuildDocumentGraphIntegrationTest extends AbstractRedactionIntegrat
 
         try (InputStream inputStream = fileResource.getInputStream()) {
             Map<Integer, List<ClassifiedImage>> pdfImages = imageServiceResponseAdapter.convertImages(TEST_DOSSIER_ID, TEST_FILE_ID);
-            Document classifiedDoc = segmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, inputStream, pdfImages);
+            ClassificationDocument classifiedDoc = segmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, inputStream, pdfImages);
             return DocumentGraphFactory.buildDocumentGraph(classifiedDoc);
         }
     }
 
 
     @SneakyThrows
-    protected DocumentGraph buildGraphNoImages(String filename) {
+    protected Document buildGraphNoImages(String filename) {
 
         if (!filename.endsWith(".pdf")) {
             filename = filename + ".pdf";
@@ -93,7 +93,7 @@ public class BuildDocumentGraphIntegrationTest extends AbstractRedactionIntegrat
 
         try (InputStream inputStream = fileResource.getInputStream()) {
             Map<Integer, List<ClassifiedImage>> pdfImages = new HashMap<>();
-            Document classifiedDoc = segmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, inputStream, pdfImages);
+            ClassificationDocument classifiedDoc = segmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, inputStream, pdfImages);
             return DocumentGraphFactory.buildDocumentGraph(classifiedDoc);
         }
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphEntityInsertionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentEntityInsertionIntegrationTest.java
similarity index 68%
rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphEntityInsertionIntegrationTest.java
rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentEntityInsertionIntegrationTest.java
index 95582bb5..1c3ea2a3 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphEntityInsertionIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentEntityInsertionIntegrationTest.java
@@ -10,21 +10,21 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.HeadlineNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Headline;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ParagraphNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Paragraph;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 
-public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGraphIntegrationTest {
+public class DocumentEntityInsertionIntegrationTest extends BuildDocumentIntegrationTest {
 
     @Autowired
     private EntityCreationService entityCreationService;
@@ -33,25 +33,25 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertCollectAllEntitiesWorks() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document.pdf");
-        createAndInsertEntity(documentGraph, "Clarissa");
-        createAndInsertEntity(documentGraph, "Lastname");
-        createAndInsertEntity(documentGraph, "David Ksenia");
-        createAndInsertEntity(documentGraph, "Michael N.");
-        createAndInsertEntity(documentGraph, "Page-Footer");
-        createAndInsertEntity(documentGraph, "CTL/with dictionary entry 1234 with Slash");
-        assertEquals(6, documentGraph.getEntities().size());
+        Document document = buildGraph("files/new/crafted document.pdf");
+        createAndInsertEntity(document, "Clarissa");
+        createAndInsertEntity(document, "Lastname");
+        createAndInsertEntity(document, "David Ksenia");
+        createAndInsertEntity(document, "Michael N.");
+        createAndInsertEntity(document, "Page-Footer");
+        createAndInsertEntity(document, "CTL/with dictionary entry 1234 with Slash");
+        assertEquals(6, document.getEntities().size());
     }
 
 
-    private RedactionEntity createAndInsertEntity(DocumentGraph documentGraph, String searchTerm) {
+    private RedactionEntity createAndInsertEntity(Document document, String searchTerm) {
 
-        int start = documentGraph.getTextBlock().indexOf(searchTerm);
+        int start = document.getTextBlock().indexOf(searchTerm);
         assert start != -1;
 
         Boundary boundary = new Boundary(start, start + searchTerm.length());
         RedactionEntity redactionEntity = RedactionEntity.initialEntityNode(boundary, "123", EntityType.ENTITY);
-        entityCreationService.addEntityToGraph(redactionEntity, documentGraph);
+        entityCreationService.addEntityToGraph(redactionEntity, document);
         return redactionEntity;
     }
 
@@ -59,9 +59,9 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertTextBeforeAndTextAfterForParagraphCrafted() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
+        Document document = buildGraph("files/new/crafted document");
         String searchTerm = "Clarissa";
-        RedactionEntity redactionEntity = createAndInsertEntity(documentGraph, searchTerm);
+        RedactionEntity redactionEntity = createAndInsertEntity(document, searchTerm);
 
         assertEquals("Expand to Hint ", redactionEntity.getTextBefore());
         assertEquals("’s Donut ←", redactionEntity.getTextAfter());
@@ -70,7 +70,7 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
                 redactionEntity.getDeepestFullyContainingNode().getHeadline().buildTextBlock().getSearchText());
         assertEquals(3, redactionEntity.getIntersectingNodes().size());
         assertEquals(5, redactionEntity.getDeepestFullyContainingNode().getNumberOnPage());
-        assertInstanceOf(ParagraphNode.class, redactionEntity.getDeepestFullyContainingNode());
+        assertInstanceOf(Paragraph.class, redactionEntity.getDeepestFullyContainingNode());
 
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
     }
@@ -79,9 +79,9 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertTextBeforeAndTextAfterForHeadlineCrafted() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
+        Document document = buildGraph("files/new/crafted document");
         String searchTerm = "Rule 39:";
-        RedactionEntity redactionEntity = createAndInsertEntity(documentGraph, searchTerm);
+        RedactionEntity redactionEntity = createAndInsertEntity(document, searchTerm);
 
         assertEquals("", redactionEntity.getTextBefore());
         assertEquals(" Purity Hint", redactionEntity.getTextAfter());
@@ -89,7 +89,7 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
         assertEquals("Rule 39: Purity Hint ", redactionEntity.getDeepestFullyContainingNode().getHeadline().buildTextBlock().getSearchText());
         assertEquals(3, redactionEntity.getIntersectingNodes().size());
         assertEquals(6, redactionEntity.getDeepestFullyContainingNode().getNumberOnPage());
-        assertInstanceOf(HeadlineNode.class, redactionEntity.getDeepestFullyContainingNode());
+        assertInstanceOf(Headline.class, redactionEntity.getDeepestFullyContainingNode());
 
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
     }
@@ -98,9 +98,9 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertTextBeforeAndTextAfterForTableCellCrafted() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
+        Document document = buildGraph("files/new/crafted document");
         String searchTerm = "1998";
-        RedactionEntity redactionEntity = createAndInsertEntity(documentGraph, searchTerm);
+        RedactionEntity redactionEntity = createAndInsertEntity(document, searchTerm);
 
         assertEquals("", redactionEntity.getTextBefore());
         assertEquals("", redactionEntity.getTextAfter());
@@ -108,7 +108,7 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
         assertEquals("Rule 6-11 (Authors Table) ", redactionEntity.getDeepestFullyContainingNode().getHeadline().buildTextBlock().getSearchText());
         assertEquals(5, redactionEntity.getIntersectingNodes().size());
         assertEquals(15, redactionEntity.getDeepestFullyContainingNode().getNumberOnPage());
-        assertInstanceOf(TableCellNode.class, redactionEntity.getDeepestFullyContainingNode());
+        assertInstanceOf(TableCell.class, redactionEntity.getDeepestFullyContainingNode());
 
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
     }
@@ -117,28 +117,28 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void findAndCheckMultipleSearchTermsCrafted() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        assertValueAndPageAndIntersectingNodes(documentGraph, "David", 1);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "Weyland Industries", 2);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "Desiree", 3);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "kawasaki@me.com", 4);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "Central Research Industry", 5);
+        Document document = buildGraph("files/new/crafted document");
+        assertValueAndPageAndIntersectingNodes(document, "David", 1);
+        assertValueAndPageAndIntersectingNodes(document, "Weyland Industries", 2);
+        assertValueAndPageAndIntersectingNodes(document, "Desiree", 3);
+        assertValueAndPageAndIntersectingNodes(document, "kawasaki@me.com", 4);
+        assertValueAndPageAndIntersectingNodes(document, "Central Research Industry", 5);
     }
 
 
     @Test
     public void assertTableStructure() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        TableNode table = (TableNode) documentGraph.getTableOfContents()//
+        Document document = buildGraph("files/new/crafted document");
+        Table table = (Table) document.getDocumentTree()//
                 .streamAllEntriesInOrder()//
                 .filter(entry -> entry.getType().equals(NodeType.TABLE))//
-                .map(TableOfContents.Entry::getNode)//
+                .map(DocumentTree.Entry::getNode)//
                 .findFirst().orElseThrow();
         assertEquals(5, table.getNumberOfCols());
         assertEquals(4, table.getNumberOfRows());
         assertEquals(5, table.streamHeaders().toList().size());
-        CharSequence firstHeader = table.streamHeadersForCell(1, 1).map(TableCellNode::buildTextBlock).map(TextBlock::getSearchText).findFirst().orElseThrow();
+        CharSequence firstHeader = table.streamHeadersForCell(1, 1).map(TableCell::buildTextBlock).map(TextBlock::getSearchText).findFirst().orElseThrow();
         assertEquals("Author(s)", firstHeader.toString().stripTrailing());
     }
 
@@ -146,31 +146,31 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void findAndCheckMultipleSearchTermsMetolachlor() {
 
-        DocumentGraph documentGraph = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
-        assertValueAndPageAndIntersectingNodes(documentGraph, "sideeffects", 4);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "Commission Regulation", 9);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "Pre-emergence", 15);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "LiChrosorb CN +", 22);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "RCC856132", 22);
-        assertValueAndPageAndIntersectingNodes(documentGraph, "Number of references included", 33);
+        Document document = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
+        assertValueAndPageAndIntersectingNodes(document, "sideeffects", 4);
+        assertValueAndPageAndIntersectingNodes(document, "Commission Regulation", 9);
+        assertValueAndPageAndIntersectingNodes(document, "Pre-emergence", 15);
+        assertValueAndPageAndIntersectingNodes(document, "LiChrosorb CN +", 22);
+        assertValueAndPageAndIntersectingNodes(document, "RCC856132", 22);
+        assertValueAndPageAndIntersectingNodes(document, "Number of references included", 33);
     }
 
 
     @Test
     public void assertTableStructureMetolachlor() {
 
-        DocumentGraph documentGraph = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
-        TableNode table = (TableNode) documentGraph.getTableOfContents()
+        Document document = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
+        Table table = (Table) document.getDocumentTree()
                 .streamAllEntriesInOrder()
                 .filter(entry -> entry.getNode().getPages().stream().anyMatch(page -> page.getNumber() == 22))
                 .filter(entry -> entry.getType().equals(NodeType.TABLE))
-                .map(TableOfContents.Entry::getNode)
+                .map(DocumentTree.Entry::getNode)
                 .findFirst()
                 .orElseThrow();
         assertEquals(5, table.getNumberOfCols());
         assertEquals(14, table.getNumberOfRows());
         assertEquals(10, table.streamHeaders().toList().size());
-        List<String> twoHeaders = table.streamHeadersForCell(2, 1).map(TableCellNode::buildTextBlock).map(TextBlock::getSearchText).toList();
+        List<String> twoHeaders = table.streamHeadersForCell(2, 1).map(TableCell::buildTextBlock).map(TextBlock::getSearchText).toList();
         assertEquals(2, twoHeaders.size());
         assertEquals("Component of residue definition: S-Metolachlor", twoHeaders.get(0).stripTrailing());
         assertEquals("Method type", twoHeaders.get(1).stripTrailing());
@@ -180,9 +180,9 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertTextBeforeAndTextAfterForParagraphMetolachlor() {
 
-        DocumentGraph documentGraph = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
+        Document document = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
         String searchTerm = "Cucurbit";
-        RedactionEntity redactionEntity = createAndInsertEntity(documentGraph, searchTerm);
+        RedactionEntity redactionEntity = createAndInsertEntity(document, searchTerm);
 
         assertEquals("except Cranberry; Vegetable, ", redactionEntity.getTextBefore());
         assertEquals(", Group 9;", redactionEntity.getTextAfter());
@@ -192,7 +192,7 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
         assertEquals(3, redactionEntity.getIntersectingNodes().size());
         assertEquals(5, redactionEntity.getDeepestFullyContainingNode().getNumberOnPage());
         assertTrue(redactionEntity.getPages().stream().allMatch(pageNode -> pageNode.getNumber() == 10));
-        assertInstanceOf(ParagraphNode.class, redactionEntity.getDeepestFullyContainingNode());
+        assertInstanceOf(Paragraph.class, redactionEntity.getDeepestFullyContainingNode());
 
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
     }
@@ -201,16 +201,16 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertTextBeforeAndTextAfterForHeadlineMetolachlor() {
 
-        DocumentGraph documentGraph = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
+        Document document = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
         String searchTerm = "absorption, distribution, metabolism";
-        int start = documentGraph.getTextBlock().indexOf(searchTerm);
+        int start = document.getTextBlock().indexOf(searchTerm);
         assert start != -1;
-        start = documentGraph.getTextBlock().indexOf(searchTerm, start + 1);
+        start = document.getTextBlock().indexOf(searchTerm, start + 1);
         assert start != -1;
 
         Boundary boundary = new Boundary(start, start + searchTerm.length());
         RedactionEntity redactionEntity = RedactionEntity.initialEntityNode(boundary, "123", EntityType.ENTITY);
-        entityCreationService.addEntityToGraph(redactionEntity, documentGraph);
+        entityCreationService.addEntityToGraph(redactionEntity, document);
 
         assertEquals("2.6.1 Summary of ", redactionEntity.getTextBefore());
         assertEquals(" and excretion in", redactionEntity.getTextAfter());
@@ -220,7 +220,7 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
         assertEquals(3, redactionEntity.getIntersectingNodes().size());
         assertEquals(4, redactionEntity.getDeepestFullyContainingNode().getNumberOnPage());
         assertTrue(redactionEntity.getPages().stream().allMatch(pageNode -> pageNode.getNumber() == 33));
-        assertInstanceOf(HeadlineNode.class, redactionEntity.getDeepestFullyContainingNode());
+        assertInstanceOf(Headline.class, redactionEntity.getDeepestFullyContainingNode());
 
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
     }
@@ -229,9 +229,9 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     @Test
     public void assertTextBeforeAndTextAfterForTableCellMetolachlor() {
 
-        DocumentGraph documentGraph = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
+        Document document = buildGraph("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06");
         String searchTerm = "N-deacetylation product";
-        RedactionEntity redactionEntity = createAndInsertEntity(documentGraph, searchTerm);
+        RedactionEntity redactionEntity = createAndInsertEntity(document, searchTerm);
 
         assertEquals("2-[(2-(1-hydroxy-ethyl)-6methyl-phenyl-amino]propan-1-ol (", redactionEntity.getTextBefore());
         assertEquals(" of metabolite of", redactionEntity.getTextAfter());
@@ -242,7 +242,7 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
         assertTrue(redactionEntity.getPages().stream().allMatch(pageNode -> pageNode.getNumber() == 54));
         assertEquals(26, redactionEntity.getDeepestFullyContainingNode().getNumberOnPage());
 
-        assertInstanceOf(TableCellNode.class, redactionEntity.getDeepestFullyContainingNode());
+        assertInstanceOf(TableCell.class, redactionEntity.getDeepestFullyContainingNode());
 
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
     }
@@ -260,20 +260,20 @@ public class DocumentGraphEntityInsertionIntegrationTest extends BuildDocumentGr
     }
 
 
-    private void assertValueAndPageAndIntersectingNodes(DocumentGraph documentGraph, String searchTerm, int pageNumber) {
+    private void assertValueAndPageAndIntersectingNodes(Document document, String searchTerm, int pageNumber) {
 
-        int start = documentGraph.getTextBlock().indexOf(searchTerm);
+        int start = document.getTextBlock().indexOf(searchTerm);
 
         assert start != -1;
 
         Boundary boundary = new Boundary(start, start + searchTerm.length());
         RedactionEntity redactionEntity = RedactionEntity.initialEntityNode(boundary, "123", EntityType.ENTITY);
-        entityCreationService.addEntityToGraph(redactionEntity, documentGraph);
-        PageNode pageNode = documentGraph.getPages().stream().filter(page -> page.getNumber() == pageNumber).findFirst().orElseThrow();
+        entityCreationService.addEntityToGraph(redactionEntity, document);
+        Page pageNode = document.getPages().stream().filter(page -> page.getNumber() == pageNumber).findFirst().orElseThrow();
 
         assertEquals(redactionEntity.getValue(), searchTerm);
         assertTrue(pageNode.getEntities().contains(redactionEntity));
-        assertTrue(documentGraph.getPages().stream().filter(page -> page != pageNode).noneMatch(page -> page.getEntities().contains(redactionEntity)));
+        assertTrue(document.getPages().stream().filter(page -> page != pageNode).noneMatch(page -> page.getEntities().contains(redactionEntity)));
         assertTrue(redactionEntity.getPages().contains(pageNode));
         assertSameOffsetInAllIntersectingNodes(searchTerm, redactionEntity);
         assertTrue(redactionEntity.getIntersectingNodes().stream().allMatch(node -> node.getEntities().contains(redactionEntity)));
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphTableNodeIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphTableNodeIntegrationTest.java
deleted file mode 100644
index 2967b4b1..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphTableNodeIntegrationTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCellNode;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
-
-public class DocumentGraphTableNodeIntegrationTest extends BuildDocumentGraphIntegrationTest {
-
-    @Test
-    public void testAllTableCellAccessesCorrect() {
-
-        DocumentGraph documentGraph = buildGraph("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06");
-        PageNode pageFive = documentGraph.getPages().stream().filter(pageNode -> pageNode.getNumber() == 5).findFirst().get();
-        TableNode tableNode = pageFive.getMainBody()
-                .stream()
-                .filter(semanticNode -> semanticNode instanceof TableNode)
-                .map(semanticNode -> (TableNode) semanticNode)
-                .findFirst()
-                .get();
-
-        for (int row = 0; row < tableNode.getNumberOfRows(); row++) {
-            for (int col = 0; col < tableNode.getNumberOfCols(); col++) {
-                TableCellNode tableCellNode = tableNode.getCell(row, col);
-                assertEquals(col, tableCellNode.getCol());
-                assertEquals(row, tableCellNode.getRow());
-            }
-        }
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphMappingIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentMappingIntegrationTest.java
similarity index 76%
rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphMappingIntegrationTest.java
rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentMappingIntegrationTest.java
index 9997baa0..c3f1224f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphMappingIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentMappingIntegrationTest.java
@@ -8,19 +8,19 @@ import org.junit.jupiter.api.Test;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.AtomicPositionBlockData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.AtomicTextBlockData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.DocumentTreeData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.PageData;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.TableOfContentsData;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentDataMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.DocumentGraphMapper;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.PropertiesMapper;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
 
 import lombok.SneakyThrows;
 
-public class DocumentGraphMappingIntegrationTest extends BuildDocumentGraphIntegrationTest {
+public class DocumentMappingIntegrationTest extends BuildDocumentIntegrationTest {
 
     @Test
     @SneakyThrows
@@ -28,56 +28,56 @@ public class DocumentGraphMappingIntegrationTest extends BuildDocumentGraphInteg
 
         String filename = "files/new/crafted document";
 
-        DocumentGraph document = buildGraph(filename);
+        Document document = buildGraph(filename);
         DocumentData documentData = DocumentDataMapper.toDocumentData(document);
 
         storageService.storeJSONObject(TenantContext.getTenantId(), filename + "_PAGES" + ".json", documentData.getPages());
         storageService.storeJSONObject(TenantContext.getTenantId(), filename + "_TEXT" + ".json", documentData.getAtomicTextBlocks());
         storageService.storeJSONObject(TenantContext.getTenantId(), filename + "_POSITIONS" + ".json", documentData.getAtomicPositionBlocks());
-        storageService.storeJSONObject(TenantContext.getTenantId(), filename + "_STRUCTURE" + ".json", documentData.getTableOfContents());
+        storageService.storeJSONObject(TenantContext.getTenantId(), filename + "_STRUCTURE" + ".json", documentData.getDocumentTreeData());
 
         PageData[] pageData = storageService.readJSONObject(TenantContext.getTenantId(), filename + "_PAGES" + ".json", PageData[].class);
         AtomicTextBlockData[] atomicTextBlockData = storageService.readJSONObject(TenantContext.getTenantId(), filename + "_TEXT" + ".json", AtomicTextBlockData[].class);
         AtomicPositionBlockData[] atomicPositionBlockData = storageService.readJSONObject(TenantContext.getTenantId(),
                 filename + "_POSITIONS" + ".json",
                 AtomicPositionBlockData[].class);
-        TableOfContentsData tableOfContentsData = storageService.readJSONObject(TenantContext.getTenantId(), filename + "_STRUCTURE" + ".json", TableOfContentsData.class);
+        DocumentTreeData documentTreeData = storageService.readJSONObject(TenantContext.getTenantId(), filename + "_STRUCTURE" + ".json", DocumentTreeData.class);
 
         DocumentData documentData2 = DocumentData.builder()
                 .pages(pageData)
-                .tableOfContents(tableOfContentsData)
+                .documentTreeData(documentTreeData)
                 .atomicTextBlocks(atomicTextBlockData)
                 .atomicPositionBlocks(atomicPositionBlockData)
                 .build();
-        DocumentGraph newDocumentGraph = DocumentGraphMapper.toDocumentGraph(documentData2);
+        Document newDocument = DocumentGraphMapper.toDocumentGraph(documentData2);
 
         assertTrue(allTablesHavePositiveNumberOfRowsAndColumns(document));
         assertTrue(allTablesHavePositiveNumberOfRowsAndColumns(documentData));
         assertTrue(allTablesHavePositiveNumberOfRowsAndColumns(documentData2));
-        assertTrue(allTablesHavePositiveNumberOfRowsAndColumns(newDocumentGraph));
+        assertTrue(allTablesHavePositiveNumberOfRowsAndColumns(newDocument));
 
-        assertEquals(document.toString(), newDocumentGraph.toString());
-        assertEquals(document.getTableOfContents().toString(), newDocumentGraph.getTableOfContents().toString());
+        assertEquals(document.toString(), newDocument.toString());
+        assertEquals(document.getDocumentTree().toString(), newDocument.getDocumentTree().toString());
     }
 
 
-    private static boolean allTablesHavePositiveNumberOfRowsAndColumns(DocumentGraph documentGraph) {
+    private static boolean allTablesHavePositiveNumberOfRowsAndColumns(Document document) {
 
-        return documentGraph.streamAllSubNodes()
-                .filter(semanticNode -> semanticNode instanceof TableNode)
-                .map(semanticNode -> (TableNode) semanticNode)
+        return document.streamAllSubNodes()
+                .filter(semanticNode -> semanticNode instanceof Table)
+                .map(semanticNode -> (Table) semanticNode)
                 .allMatch(tableNode -> tableNode.getNumberOfCols() > 0 && tableNode.getNumberOfRows() > 0);
     }
 
 
     private static boolean allTablesHavePositiveNumberOfRowsAndColumns(DocumentData documentData) {
 
-        return documentData.getTableOfContents()
+        return documentData.getDocumentTreeData()
                 .streamAllEntries()
                 .filter(entryData -> entryData.getType().equals(NodeType.TABLE))
-                .map(TableOfContentsData.EntryData::getProperties)
+                .map(DocumentTreeData.EntryData::getProperties)
                 .map(properties -> {
-                    var builder = TableNode.builder();
+                    var builder = Table.builder();
                     PropertiesMapper.parseTableProperties(properties, builder);
                     return builder.build();
                 })
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentTableIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentTableIntegrationTest.java
new file mode 100644
index 00000000..dab62c2e
--- /dev/null
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentTableIntegrationTest.java
@@ -0,0 +1,30 @@
+package com.iqser.red.service.redaction.v1.server.document.graph;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.TableCell;
+
+public class DocumentTableIntegrationTest extends BuildDocumentIntegrationTest {
+
+    @Test
+    public void testAllTableCellAccessesCorrect() {
+
+        Document document = buildGraph("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06");
+        Page pageFive = document.getPages().stream().filter(pageNode -> pageNode.getNumber() == 5).findFirst().get();
+        Table table = pageFive.getMainBody().stream().filter(semanticNode -> semanticNode instanceof Table).map(semanticNode -> (Table) semanticNode).findFirst().get();
+
+        for (int row = 0; row < table.getNumberOfRows(); row++) {
+            for (int col = 0; col < table.getNumberOfCols(); col++) {
+                TableCell tableCell = table.getCell(row, col);
+                assertEquals(col, tableCell.getCol());
+                assertEquals(row, tableCell.getRow());
+            }
+        }
+    }
+
+}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphVisualizationIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentVisualizationIntegrationTest.java
similarity index 64%
rename from redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphVisualizationIntegrationTest.java
rename to redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentVisualizationIntegrationTest.java
index ca2ea253..803b8e3b 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentGraphVisualizationIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/DocumentVisualizationIntegrationTest.java
@@ -9,13 +9,13 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfDraw;
 
 import lombok.SneakyThrows;
 
-public class DocumentGraphVisualizationIntegrationTest extends BuildDocumentGraphIntegrationTest {
+public class DocumentVisualizationIntegrationTest extends BuildDocumentIntegrationTest {
 
     @Test
     @SneakyThrows
@@ -24,10 +24,10 @@ public class DocumentGraphVisualizationIntegrationTest extends BuildDocumentGrap
 
         String filename = "files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06";
 
-        DocumentGraph documentGraph = buildGraph(filename);
-        TextBlock textBlock = documentGraph.buildTextBlock();
+        Document document = buildGraph(filename);
+        TextBlock textBlock = document.buildTextBlock();
 
-        visualizeSemanticNodes(filename, documentGraph, textBlock);
+        visualizeSemanticNodes(filename, document, textBlock);
     }
 
 
@@ -38,10 +38,10 @@ public class DocumentGraphVisualizationIntegrationTest extends BuildDocumentGrap
 
         String filename = "files/Fludioxonil/56 Fludioxonil_RAR_12_Volume_3CA_B-7_2018-02-21";
 
-        DocumentGraph documentGraph = buildGraph(filename);
-        TextBlock textBlock = documentGraph.buildTextBlock();
+        Document document = buildGraph(filename);
+        TextBlock textBlock = document.buildTextBlock();
 
-        visualizeSemanticNodes(filename, documentGraph, textBlock);
+        visualizeSemanticNodes(filename, document, textBlock);
     }
 
 
@@ -52,10 +52,10 @@ public class DocumentGraphVisualizationIntegrationTest extends BuildDocumentGrap
 
         String filename = "files/new/test1S1T1";
 
-        DocumentGraph documentGraph = buildGraph(filename);
-        TextBlock textBlock = documentGraph.buildTextBlock();
+        Document document = buildGraph(filename);
+        TextBlock textBlock = document.buildTextBlock();
 
-        visualizeSemanticNodes(filename, documentGraph, textBlock);
+        visualizeSemanticNodes(filename, document, textBlock);
     }
 
 
@@ -66,21 +66,21 @@ public class DocumentGraphVisualizationIntegrationTest extends BuildDocumentGrap
 
         String filename = "files/new/crafted document";
 
-        DocumentGraph documentGraph = buildGraph(filename);
-        TextBlock textBlock = documentGraph.buildTextBlock();
+        Document document = buildGraph(filename);
+        TextBlock textBlock = document.buildTextBlock();
 
-        visualizeSemanticNodes(filename, documentGraph, textBlock);
+        visualizeSemanticNodes(filename, document, textBlock);
     }
 
 
-    private static void visualizeSemanticNodes(String filename, DocumentGraph documentGraph, TextBlock textBlock) throws IOException {
+    private static void visualizeSemanticNodes(String filename, Document document, TextBlock textBlock) throws IOException {
 
         var tmpFileName = "/tmp/" + filename.split("/")[2] + "_SEMANTIC_NODES_BBOX.pdf";
         var fileResource = new ClassPathResource(filename + ".pdf");
 
         try (var fileStream = fileResource.getInputStream()) {
             PDDocument pdDocument = PDDocument.load(fileStream);
-            PdfDraw.drawDocumentGraph(pdDocument, documentGraph);
+            PdfDraw.drawDocumentGraph(pdDocument, document);
             PdfDraw.drawTextBlock(pdDocument, textBlock, PdfDraw.Options.builder().stroke(true).strokeWidth(0.1f).strokeColor(Color.YELLOW).build());
             File outputFile = new File(tmpFileName);
             pdDocument.save(outputFile);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/ManualResizeRedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/ManualResizeRedactionIntegrationTest.java
index cc8b6163..98272601 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/ManualResizeRedactionIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/ManualResizeRedactionIntegrationTest.java
@@ -31,16 +31,16 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ParagraphNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Paragraph;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.ManualRedactionApplicationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 
 @Import(ManualResizeRedactionIntegrationTest.TestConfiguration.class)
-public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphIntegrationTest {
+public class ManualResizeRedactionIntegrationTest extends BuildDocumentIntegrationTest {
 
     private static final String RULES = "drools/manual_redaction_rules.drl";
 
@@ -55,7 +55,7 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
     private KieContainer kieContainer;
 
     @Configuration
-    @Import(BuildDocumentGraphIntegrationTest.TestConfiguration.class)
+    @Import(BuildDocumentIntegrationTest.TestConfiguration.class)
     public static class TestConfiguration {
 
         @Bean
@@ -78,9 +78,9 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
     @Test
     public void manualResizeRedactionTest() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, documentGraph).collect(Collectors.toUnmodifiableSet());
-        Set<RedactionEntity> biggerEntities = entityCreationService.byString("David Ksenia Max Mustermann", "CBI_author", EntityType.ENTITY, documentGraph)
+        Document document = buildGraph("files/new/crafted document");
+        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, document).collect(Collectors.toUnmodifiableSet());
+        Set<RedactionEntity> biggerEntities = entityCreationService.byString("David Ksenia Max Mustermann", "CBI_author", EntityType.ENTITY, document)
                 .collect(Collectors.toUnmodifiableSet());
 
         RedactionEntity entity = entities.stream().filter(e -> e.getPages().stream().anyMatch(p -> p.getNumber() == 1)).findFirst().get();
@@ -115,8 +115,8 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
     @Test
     public void manualForceRedactionTest() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, documentGraph).collect(Collectors.toUnmodifiableSet());
+        Document document = buildGraph("files/new/crafted document");
+        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, document).collect(Collectors.toUnmodifiableSet());
 
         RedactionEntity entity = entities.stream().filter(e -> e.getPages().stream().anyMatch(p -> p.getNumber() == 1)).findFirst().get();
 
@@ -134,7 +134,7 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
         kieSession.fireAllRules();
         kieSession.dispose();
 
-        assertEquals(ParagraphNode.class, entity.getDeepestFullyContainingNode().getClass());
+        assertEquals(Paragraph.class, entity.getDeepestFullyContainingNode().getClass());
         assertFalse(entity.getIntersectingNodes().isEmpty());
         assertEquals(1, entity.getPages().size());
         assertEquals("David Ksenia", entity.getValue());
@@ -148,8 +148,8 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
     @Test
     public void manualIDRemovalTest() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, documentGraph).collect(Collectors.toUnmodifiableSet());
+        Document document = buildGraph("files/new/crafted document");
+        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, document).collect(Collectors.toUnmodifiableSet());
 
         RedactionEntity entity = entities.stream().filter(e -> e.getPages().stream().anyMatch(p -> p.getNumber() == 1)).findFirst().get();
 
@@ -175,8 +175,8 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
     @Test
     public void manualIDRemovalButAlsoForceRedactionTest() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, documentGraph).collect(Collectors.toUnmodifiableSet());
+        Document document = buildGraph("files/new/crafted document");
+        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, document).collect(Collectors.toUnmodifiableSet());
 
         RedactionEntity entity = entities.stream().filter(e -> e.getPages().stream().anyMatch(p -> p.getNumber() == 1)).findFirst().get();
 
@@ -196,7 +196,7 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
         kieSession.fireAllRules();
         kieSession.dispose();
 
-        assertEquals(ParagraphNode.class, entity.getDeepestFullyContainingNode().getClass());
+        assertEquals(Paragraph.class, entity.getDeepestFullyContainingNode().getClass());
         assertFalse(entity.getIntersectingNodes().isEmpty());
         assertEquals(1, entity.getPages().size());
         assertEquals("David Ksenia", entity.getValue());
@@ -208,8 +208,8 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
     @Test
     public void manualIDRemovalNotApprovedTest() {
 
-        DocumentGraph documentGraph = buildGraph("files/new/crafted document");
-        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, documentGraph).collect(Collectors.toUnmodifiableSet());
+        Document document = buildGraph("files/new/crafted document");
+        Set<RedactionEntity> entities = entityCreationService.byString("David Ksenia", "CBI_author", EntityType.ENTITY, document).collect(Collectors.toUnmodifiableSet());
 
         RedactionEntity entity = entities.stream().filter(e -> e.getPages().stream().anyMatch(p -> p.getNumber() == 1)).findFirst().get();
 
@@ -223,7 +223,7 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
         kieSession.fireAllRules();
         kieSession.dispose();
 
-        assertEquals(ParagraphNode.class, entity.getDeepestFullyContainingNode().getClass());
+        assertEquals(Paragraph.class, entity.getDeepestFullyContainingNode().getClass());
         assertFalse(entity.getIntersectingNodes().isEmpty());
         assertEquals(1, entity.getPages().size());
         assertEquals("David Ksenia", entity.getValue());
@@ -254,7 +254,7 @@ public class ManualResizeRedactionIntegrationTest extends BuildDocumentGraphInte
 
     private static List<Rectangle> toAnnotationRectangles(RedactionPosition redactionPositions) {
 
-        return redactionPositions.getRectanglePerLine().stream().map(rectangle2D -> toAnnotationRectangle(rectangle2D, redactionPositions.getPageNode().getNumber())).toList();
+        return redactionPositions.getRectanglePerLine().stream().map(rectangle2D -> toAnnotationRectangle(rectangle2D, redactionPositions.getPage().getNumber())).toList();
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java
index 055d8440..edcec53c 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java
@@ -8,6 +8,7 @@ import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -45,6 +46,7 @@ import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.TableServiceResponseAdapter;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.redaction.v1.server.queue.RedactionMessageReceiver;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
@@ -75,6 +77,9 @@ public class LiveDataIntegrationTest {
     @MockBean
     private LegalBasisClient legalBasisClient;
 
+    @MockBean
+    private TableServiceResponseAdapter tableServiceResponseAdapter;
+
     @Autowired
     private ResourcePatternResolver resourcePatternResolver;
 
@@ -120,6 +125,8 @@ public class LiveDataIntegrationTest {
     @BeforeEach
     public void prepareTest() {
 
+        when(tableServiceResponseAdapter.convertTables(anyString(), anyString())).thenReturn(new HashMap<>());
+
         TenantContext.setTenantId("redaction");
         when(dictionaryClient.getVersion(anyString())).thenReturn(1L);
         when(dictionaryClient.getVersionForDossier(anyString())).thenReturn(1L);
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapterTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapterTest.java
index 8c01796e..9fc0a542 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapterTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapterTest.java
@@ -18,20 +18,20 @@ import org.springframework.core.io.ClassPathResource;
 
 import com.iqser.red.commons.jackson.ObjectMapperFactory;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntitiesModel;
-import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentGraphIntegrationTest;
+import com.iqser.red.service.redaction.v1.server.document.graph.BuildDocumentIntegrationTest;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionPosition;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfDraw;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-class NerEntitiesAdapterTest extends BuildDocumentGraphIntegrationTest {
+class NerEntitiesAdapterTest extends BuildDocumentIntegrationTest {
 
     @Autowired
     private NerEntitiesAdapter nerEntitiesAdapter;
@@ -53,19 +53,19 @@ class NerEntitiesAdapterTest extends BuildDocumentGraphIntegrationTest {
 
         String filePath = "files/new/crafted document.pdf";
         String nerEntitiesFilePath = "ner_entities/crafted document.NER_ENTITIES.json";
-        DocumentGraph documentGraph = buildGraphNoImages(filePath);
-        List<NerEntities.NerEntity> entityRecognitionEntities = validateAndCombine(parseNerEntities(nerEntitiesFilePath), documentGraph);
+        Document document = buildGraphNoImages(filePath);
+        List<NerEntities.NerEntity> entityRecognitionEntities = validateAndCombine(parseNerEntities(nerEntitiesFilePath), document);
         assertFalse(entityRecognitionEntities.isEmpty());
         assertTrue(entityRecognitionEntities.stream().allMatch(entity -> entity.boundary().start() < entity.boundary().end()));
 
         ClassPathResource resource = new ClassPathResource(filePath);
         PDDocument pdDocument = PDDocument.load(resource.getInputStream());
-        Stream<NerEntities.NerEntity> unchangedAddressParts = nerEntitiesAdapter.toNerEntities(parseNerEntities(nerEntitiesFilePath), documentGraph)
+        Stream<NerEntities.NerEntity> unchangedAddressParts = nerEntitiesAdapter.toNerEntities(parseNerEntities(nerEntitiesFilePath), document)
                 .getNerEntityList()
                 .stream()
                 .filter(e -> !e.type().equals("CBI_author"));
         List<RedactionEntity> redactionEntities = Stream.concat(entityRecognitionEntities.stream(), unchangedAddressParts)
-                .map(e -> entityCreationService.byBoundary(e.boundary(), e.type(), EntityType.ENTITY, documentGraph))
+                .map(e -> entityCreationService.byBoundary(e.boundary(), e.type(), EntityType.ENTITY, document))
                 .toList();
         redactionEntities.stream()
                 .collect(Collectors.groupingBy(e -> e.getPages().stream().findFirst().get().getNumber()))
@@ -88,26 +88,26 @@ class NerEntitiesAdapterTest extends BuildDocumentGraphIntegrationTest {
 
         String filePath = "files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf";
         String nerEntitiesFilePath = "ner_entities/S-Metolachlor_RAR_02_Volume_2_2018-09-06.NER_ENTITIES.json";
-        DocumentGraph documentGraph = buildGraphNoImages(filePath);
+        Document document = buildGraphNoImages(filePath);
         log.info("Graph built");
         NerEntitiesModel nerEntitiesModel = parseNerEntities(nerEntitiesFilePath);
         log.info("Parsed NerEntitiesModel");
-        NerEntities nerEntities = nerEntitiesAdapter.toNerEntities(nerEntitiesModel, documentGraph);
+        NerEntities nerEntities = nerEntitiesAdapter.toNerEntities(nerEntitiesModel, document);
         log.info("Validated and mapped");
         List<Boundary> nerEntityBoundaries = nerEntitiesAdapter.combineNerEntitiesToCbiAddressDefaults(nerEntities).toList();
         log.info("Combined to CBI_address");
         List<RedactionEntity> cbiAddressEntities = nerEntityBoundaries.stream()
-                .map(b -> entityCreationService.byBoundary(b, "CBI_address", EntityType.RECOMMENDATION, documentGraph))
+                .map(b -> entityCreationService.byBoundary(b, "CBI_address", EntityType.RECOMMENDATION, document))
                 .toList();
         assertFalse(cbiAddressEntities.isEmpty());
         assertTrue(cbiAddressEntities.stream().allMatch(entity -> entity.getBoundary().start() < entity.getBoundary().end()));
 
         ClassPathResource resource = new ClassPathResource(filePath);
         PDDocument pdDocument = PDDocument.load(resource.getInputStream());
-        List<RedactionEntity> validatedEntities = nerEntitiesAdapter.toNerEntities(parseNerEntities(nerEntitiesFilePath), documentGraph)
+        List<RedactionEntity> validatedEntities = nerEntitiesAdapter.toNerEntities(parseNerEntities(nerEntitiesFilePath), document)
                 .getNerEntityList()
                 .stream()
-                .map(e -> entityCreationService.byBoundary(e.boundary(), e.type(), EntityType.ENTITY, documentGraph))
+                .map(e -> entityCreationService.byBoundary(e.boundary(), e.type(), EntityType.ENTITY, document))
                 .toList();
         Stream.concat(cbiAddressEntities.stream(), validatedEntities.stream())
                 .collect(Collectors.groupingBy(e -> e.getPages().stream().findFirst().get().getNumber()))
@@ -124,13 +124,13 @@ class NerEntitiesAdapterTest extends BuildDocumentGraphIntegrationTest {
     }
 
 
-    private List<NerEntities.NerEntity> validateAndCombine(NerEntitiesModel nerEntitiesModel, DocumentGraph documentGraph) {
+    private List<NerEntities.NerEntity> validateAndCombine(NerEntitiesModel nerEntitiesModel, Document document) {
 
-        NerEntities nerEntities = nerEntitiesAdapter.toNerEntities(nerEntitiesModel, documentGraph);
+        NerEntities nerEntities = nerEntitiesAdapter.toNerEntities(nerEntitiesModel, document);
 
         List<NerEntities.NerEntity> cbiAuthors = nerEntities.streamEntitiesOfType("CBI_author").toList();
         Stream<NerEntities.NerEntity> cbiAddress = nerEntitiesAdapter.combineNerEntitiesToCbiAddressDefaults(nerEntities)
-                .map(boundary -> new NerEntities.NerEntity(documentGraph.buildTextBlock().subSequence(boundary).toString(), boundary, "CBI_address"));
+                .map(boundary -> new NerEntities.NerEntity(document.buildTextBlock().subSequence(boundary).toString(), boundary, "CBI_address"));
 
         return Stream.concat(cbiAuthors.stream(), cbiAddress).toList();
     }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelServiceTest.java
deleted file mode 100644
index fc4e906e..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/rulebuilder/RuleBuilderModelServiceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.rulebuilder;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
-import org.junit.jupiter.api.Test;
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-
-public class RuleBuilderModelServiceTest {
-
-    @Test
-    public void testRuleBuilderModelProvider() {
-
-        RuleBuilderModel model = new RuleBuilderModelService().getRuleBuilderModel();
-
-        assertThat(model.getWhenClauses().size()).isGreaterThan(1);
-        assertThat(model.getThenConditions().size()).isGreaterThan(1);
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtilsTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtilsTest.java
deleted file mode 100644
index 6752c4bb..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtilsTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.jupiter.api.Test;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-
-public class EntitySearchUtilsTest {
-
-    @Test
-    public void testNestedEntitiesRemoval() {
-
-        Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        entities.add(nested);
-        entities.add(nesting);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-
-        assertThat(entities.size()).isEqualTo(1);
-        assertThat(entities).contains(nesting);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result).contains(foundEntities1);
-        assertThat(result).contains(foundEntities2);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedStartAndEndOverlapping() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result).contains(foundEntities1);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedStartAndEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result).contains(foundEntities1);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedExistingAndExpandedEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities3 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-        foundEntities.add(foundEntities3);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.contains(foundEntities2));
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedEndLong() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntitiesOverlap1 = new Entity("Batman X. Superman Y.", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntitiesOverlap2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntitiesSubset1 = new Entity("Batman X. Superman", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntitiesSubset2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntitiesOverlap1);
-        foundEntities.add(foundEntitiesOverlap2);
-        foundEntities.add(foundEntitiesSubset1);
-        foundEntities.add(foundEntitiesSubset2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result).containsExactlyInAnyOrder(foundEntitiesSubset1, foundEntitiesSubset2);
-
-    }
-
-}
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java
index 96cf4a97..0bd8492a 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.segmentation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,7 +38,7 @@ import com.iqser.red.service.redaction.v1.server.Application;
 import com.iqser.red.service.redaction.v1.server.FileSystemBackedStorageService;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image.ImageServiceResponse;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
@@ -45,9 +46,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.se
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service.TableExtractionService;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 import com.iqser.red.service.redaction.v1.server.multitenancy.TenantContext;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
@@ -127,7 +127,7 @@ public class PdfSegmentationServiceTest {
         Map<Integer, List<ClassifiedImage>> images = new HashMap<>();
         imageServiceResponse.getData()
                 .forEach(imageMetadata -> images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
-                        .add(new ClassifiedImage(new RedRectangle2D(imageMetadata.getPosition().getX1(),
+                        .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
                                 imageMetadata.getPosition().getY1(),
                                 imageMetadata.getGeometry().getWidth(),
                                 imageMetadata.getGeometry().getHeight()),
@@ -145,7 +145,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Spanning Cells.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
         assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
         TablePageBlock table = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
         assertThat(table.getColCount()).isEqualTo(6);
@@ -160,7 +160,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Table.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
         assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
         TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
         assertThat(firstTable.getColCount()).isEqualTo(8);
@@ -179,7 +179,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Multi Page Table.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
         assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
         TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
         assertThat(firstTable.getColCount()).isEqualTo(9);
@@ -198,7 +198,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Rotated Table Headers.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
         assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList())).isNotEmpty();
         TablePageBlock firstTable = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).collect(Collectors.toList()).get(0);
         assertThat(firstTable.getColCount()).isEqualTo(8);
@@ -217,7 +217,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/56 Fludioxonil_RAR_12_Volume_3CA_B-7_2018-02-21_Page170.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 4);
 
@@ -235,7 +235,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/VV-931175_Page1.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
 
@@ -277,7 +277,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/27 A8637C - EU AIR3 - MCP Section 1 - Identity of the plant protection product_Page6.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 4);
 
@@ -295,7 +295,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/A20622A izRMS (CZ) fRR Part B9_Page185.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
 
@@ -311,7 +311,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/A20622A izZRMS (CZ) fRR Part B7_Page123.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 6);
 
@@ -331,7 +331,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/77 Pirimicarb_RAR_08_Volume_3CA_B-6_2017-12-04_Page11.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 3);
 
@@ -348,7 +348,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/95 Trinexapac-ethyl_RAR_08_Volume_3CA_B-6_2018-01-10_Page532.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
         validateTable(document, 0, 9, 9, 0, 0);
@@ -362,7 +362,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21_Page175.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
 
@@ -377,7 +377,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21_Page174.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
         validateTable(document, 0, 9, 6, 7, 0);
@@ -391,7 +391,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/19 Chlorothalonil RAR 08 Volume 3CA B 6b metabolites Oct 2017_Page35.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
         validateTable(document, 0, 10, 6, 0, 1);
@@ -405,7 +405,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/19 Chlorothalonil RAR 08 Volume 3CA B 6b metabolites Oct 2017_Page161.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
         validateTable(document, 0, 2, 2, 0, 0);
@@ -421,7 +421,7 @@ public class PdfSegmentationServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource(
                 "files/SinglePages/47 Cyprodinil - EU AIR3 - MCA Section 5 Supplement - Toxicological and metabolism studies on the active substance_Page30.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
 
@@ -438,7 +438,7 @@ public class PdfSegmentationServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource(
                 "files/SinglePages/49 Cyprodinil - EU AIR3 - MCA Section 8 Supplement - Ecotoxicological studies on the active substance_Page61.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
 
@@ -454,7 +454,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/81 Pirimicarb_RAR_20_Volume_3CP_A10788A (_Pirimor_)_B-9_2017-12-04_Page54.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
 
@@ -470,7 +470,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/85 Pydiflumetofen_DAR_08_Volume_3CA_B-6_2017-07-26_Page134.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
 
@@ -486,7 +486,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/Thiabendazole DAR Addendum for ED_April_2020_Page18.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 4);
 
@@ -504,7 +504,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/15 - Pretilachlor - Acute Oral Toxicity (Up and Down Procedure) - Rat_Page18.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
 
@@ -520,7 +520,7 @@ public class PdfSegmentationServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource(
                 "files/SinglePages/28 A8637C - EU AIR3 - MCP Section 10 - Ecotoxicological studies on the plant protection product_Page23.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 2);
 
@@ -536,7 +536,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/24 - SYN549522 - Acute Oral Toxicity - Rats_Page17.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
 
@@ -551,7 +551,7 @@ public class PdfSegmentationServiceTest {
         prepareStorage();
         ClassPathResource pdfFileResource = new ClassPathResource("files/SinglePages/30 - Dicamba - Acute Oral Toxicity - Rats_Page5.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
+        ClassificationDocument document = pdfSegmentationService.parseDocument(TEST_DOSSIER_ID, TEST_FILE_ID, pdfFileResource.getInputStream(), null);
 
         validateTableSize(document, 1);
 
@@ -560,7 +560,7 @@ public class PdfSegmentationServiceTest {
     }
 
 
-    private void validateTable(Document document, int tableIndex, int colCount, int rowCount, int emptyCellsCountCorrect, int emptyCellsCountIncorrect) {
+    private void validateTable(ClassificationDocument document, int tableIndex, int colCount, int rowCount, int emptyCellsCountCorrect, int emptyCellsCountIncorrect) {
 
         TablePageBlock table = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(tableIndex);
         List<List<Cell>> rows = table.getRows();
@@ -574,7 +574,7 @@ public class PdfSegmentationServiceTest {
     }
 
 
-    private void validateTable(Document document, int tableIndex, List<List<String>> values) {
+    private void validateTable(ClassificationDocument document, int tableIndex, List<List<String>> values) {
 
         TablePageBlock table = document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().get(tableIndex);
         List<List<Cell>> rows = table.getRows();
@@ -591,7 +591,7 @@ public class PdfSegmentationServiceTest {
     }
 
 
-    private void validateTableSize(Document document, int tableSize) {
+    private void validateTableSize(ClassificationDocument document, int tableSize) {
 
         assertThat(document.getSections().stream().flatMap(paragraph -> paragraph.getTables().stream()).toList().size()).isEqualTo(tableSize);
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/allAuthors.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/allAuthors.drl
deleted file mode 100644
index fd181952..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/allAuthors.drl
+++ /dev/null
@@ -1,293 +0,0 @@
-package drools
-
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section
-
-global Section section
-
-
-// --------------------------------------- CBI rules -------------------------------------------------------------------
-
-//rule "0: Expand CBI Authors with firstname initials"
-//    when
-//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
-//    then
-//        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//    end
-
-rule "0: Expand CBI Authors with firstname initials"
-    when
-        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
-    then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+",dictionary);
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+",dictionary);
-    end
-
-
-rule "1: Redact CBI Authors"
-    when
-        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
-    then
-        section.redact("CBI_author", 1, "Author found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "2: Redact CBI Address"
-    when
-        Section(matchesType("CBI_address") || matchesType("recommendation_CBI_address"))
-    then
-        section.redact("CBI_address", 2, "Address found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "3: Do not redact genitive CBI_author"
-    when
-        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
-    then
-        section.expandToHintAnnotationByRegEx("CBI_author", "['’’'ʼˈ´`‘′ʻ’']s", false, 0, "test_method");
-        section.expandToHintAnnotationByRegEx("recommendation_CBI_author", "['’’'ʼˈ´`‘′ʻ’']s", false, 0, "test_method");
-    end
-
-
-rule "4: Redact Author(s) cells in Tables with Author(s) header"
-    when
-        Section(hasTableHeader("Author(s)") && !hasTableHeader("Vertebrate study Y/N"))
-    then
-        section.redactCell("Author(s)", 4, "CBI_author", false, "Author found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "5: Redact Author cells in Tables with Author header"
-    when
-        Section(hasTableHeader("Author") && !hasTableHeader("Vertebrate study Y/N"))
-    then
-        section.redactCell("Author", 5, "CBI_author", false, "Author found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "6: Redact and recommand Authors in Tables with Vertebrate study Y/N header"
-    when
-        Section(rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes") || rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No"))
-    then
-        section.redactCell("Author(s)", 6, "CBI_author", true, "Author found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "7: Redact if CTL/* or BL/*  was found"
-    when
-        Section(searchText.contains("CTL/") || searchText.contains("BL/"))
-    then
-        section.addRedaction("CTL", "must_redact", 7, "Laboratory for vertebrate studies found", "Article 39(1)(2) of Regulation (EC) No 178/2002", dictionary);
-        section.addRedaction("BL", "must_redact", 7, "Laboratory for vertebrate studies found", "Article 39(1)(2) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-
-rule "8: Redact and add recommendation for et al. author"
-    when
-        Section(searchText.contains("et al"))
-    then
-		section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 8, "Author found", "Reg (EC) No 1107/2009 Art. 63 (2g)",dictionary);
-    end
-
-
-rule "9: Add recommendation for Addresses in Test Organism sections"
-    when
-        Section(searchText.contains("Species:") && searchText.contains("Source:"))
-    then
-		section.recommendLineAfter("Source:", "CBI_address");
-    end
-
-
-rule "10: Add recommendation for Addresses in Test Animals sections"
-    when
-        Section(searchText.contains("Species") && searchText.contains("Source"))
-    then
-		section.recommendLineAfter("Source", "CBI_address");
-    end
-
-
-rule "11: Do not redact Names and Addresses if Published Information found"
-    when
-        Section(matchesType("published_information"))
-    then
-        section.redactNot("CBI_author", 11, "Published Information found");
-        section.redactNot("CBI_address", 11, "Published Information found");
-    end
-
-
-// --------------------------------------- PII rules -------------------------------------------------------------------
-
-
-rule "12: Redacted PII Personal Identification Information"
-    when
-        Section(matchesType("PII"))
-    then
-        section.redact("PII", 12, "PII (Personal Identification Information) found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "13: Redact Emails by RegEx"
-    when
-        Section(searchText.contains("@"))
-    then
-        section.redactByRegEx("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b", true, 0, "PII", 13, "PII (Personal Identification Information) found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "14: Redact contact information"
-    when
-       Section(text.contains("Contact point:")
-       || text.contains("Phone:")
-       || text.contains("Fax:")
-       || text.contains("Tel.:")
-       || text.contains("Tel:")
-       || text.contains("E-mail:")
-       || text.contains("Email:")
-       || text.contains("e-mail:")
-       || text.contains("E-mail address:")
-       || text.contains("Alternative contact:")
-       || text.contains("Telephone number:")
-       || text.contains("Telephone No:")
-       || text.contains("Fax number:")
-       || text.contains("Telephone:")
-       || text.contains("Phone No.")
-       || text.contains("European contact:"))
-    then
-          section.redactLineAfter("Contact point:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Phone:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Fax:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Tel.:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Tel:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("E-mail:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Email:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("e-mail:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("E-mail address:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Contact:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Alternative contact:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone number:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone No:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Fax number:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Phone No.", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactBetween("No:", "Fax", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactBetween("Contact:", "Tel.:", "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("European contact:",  "PII", 14, true, "Contact information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-     end
-
-
-rule "15: Redact contact information if applicant is found"
-    when
-        Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Telephone number:"))
-    then
-        section.redactLineAfter("Contact point:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel.:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Email:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("e-mail:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail address:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Alternative contact:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone number:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone No:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax number:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone No.", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("Contact:", "Tel.:", "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("European contact:",  "PII", 15, true, "Applicant information was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "16: Redact contact information if Producer is found"
-    when
-        Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
-    then
-        section.redactLineAfter("Contact:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax number:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone number:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel:", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone No.", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 16, true, "Producer was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "17: Redact AUTHOR(S)"
-    when
-        Section(searchText.contains("AUTHOR(S):"))
-    then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 17, true, "AUTHOR(S) was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "18: Redact PERFORMING LABORATORY"
-    when
-        Section(searchText.contains("PERFORMING LABORATORY:"))
-    then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 18, true, "PERFORMING LABORATORY was found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "19: Redact On behalf of Sequani Ltd.:"
-    when
-        Section(searchText.contains("On behalf of Sequani Ltd.: Name Title"))
-    then
-        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 19, false , "PII (Personal Identification Information) found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "20: Redact On behalf of Syngenta Ltd.:"
-    when
-        Section(searchText.contains("On behalf of Syngenta Ltd.: Name Title"))
-    then
-        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 20, false , "PII (Personal Identification Information) found", "Article 39(1)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-// --------------------------------------- other rules -------------------------------------------------------------------
-
-rule "21: Purity Hint"
-    when
-        Section(searchText.toLowerCase().contains("purity"))
-    then
-	    section.addHintAnnotationByRegEx("(purity ?( of|\\(.{1,20}\\))?( ?:)?) .{0,5}[\\d\\.]+( .{0,4}\\.)? ?%", true, 1, "hint_only",dictionary);
-    end
-
-
-rule "22: Redact Must Redact"
-    when
-        Section(matchesType("must_redact"))
-    then
-        section.redact("must_redact", 22, "Must Redact found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "23: Redact signatures"
-    when
-        Section(matchesImageType("signature"))
-    then
-        section.redactImage("signature", 23, "Signature found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-
-rule "24: Redact formula"
-    when
-        Section(matchesImageType("formula"))
-    then
-        section.redactImage("formula", 24, "Formula found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-
-rule "25: Redact Logos"
-    when
-        Section(matchesImageType("logo"))
-    then
-        section.redactImage("logo", 25, "Logo found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
\ No newline at end of file
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/entity_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/entity_rules.drl
deleted file mode 100644
index e4208744..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/entity_rules.drl
+++ /dev/null
@@ -1,315 +0,0 @@
-package drools
-
-import static java.lang.String.format;
-import static com.iqser.red.service.redaction.v1.server.document.services.CharSequenceSearchUtils.anyMatch;
-import static com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentService.setFields;
-
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.*
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.*
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.*
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.*
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import java.util.Set
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine
-import com.iqser.red.service.redaction.v1.server.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary
-import com.iqser.red.service.redaction.v1.server.layoutparsing.layout.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.layout.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-
-global DocumentGraph document
-global EntityCreationService entityCreationService
-global Dictionary dictionary
-
-// --------------------------------------- CBI rules -------------------------------------------------------------------
-
-rule "1: Redact CBI Authors (Non vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 1, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "2: Redact CBI Authors (Vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "no")
-        $entity: RedactionEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 2, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "3: Don't redact CBI Address (Non vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "no")
-        $entity: RedactionEntity(type == "CBI_address", entityType == EntityType.ENTITY)
-    then
-        setFields($entity, 3, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "4: Redact CBI Address (Vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_address", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 4, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "5: Add FALSE_POSITIVE Entity for genitive CBI_author"
-
-    when
-        $entity: RedactionEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"), redaction)
-    then
-        RedactionEntity entity = entityCreationService.byBoundary($entity.getBoundary(), "CBI_author", EntityType.FALSE_POSITIVE, document);
-        setFields($entity, 5, "Genitive Author", null, Engine.RULE);
-        insert(entity);
-    end
-
-
-rule "6: Create Entity from Author(s) cells in Tables with Author(s) header and add Authorname as Recommendation"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        authorCell: TableCellNode(!header, (hasHeader("Author(s)") || hasHeader("Author")), hasText())
-    then
-        RedactionEntity entity = entityCreationService.bySemanticNode(authorCell, "CBI_author", EntityType.ENTITY);
-        setFields(entity, 6, "Header Author(s) found", null, Engine.RULE);
-        insert(entity);
-        dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), true);
-    end
-
-rule "7: Add CBI_author with \"et al.\" Regex"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-         $section: SectionNode(containsString("et al."))
-    then
-         Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, $section);
-         setFields(entities, 7, "Found by \"et al.\" regex", null, Engine.RULE);
-         entities.forEach(entity -> insert(entity));
-         entities.forEach(entity -> dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), false));
-    end
-
-rule "8: Add recommendation for Addresses in Test Organism sections"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString("Source",  "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 8, "Line after \"Source\" in Test Organism Section", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-
-rule "9: Add recommendation for Addresses in Test Animals sections"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("Species:") && containsString("Source:"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString("Source:", "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 9, "Line after \"Source:\" in Test Organism Section", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "12: Recommend CTL/BL laboratory that start with BL or CTL"
-
-    when
-        $section : SectionNode(containsString("BL") || containsString("CT"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("((\\b((([Cc]T(([1ILli\\/])| L|~P))|(BL))[\\. ]?([\\dA-Ziltphz~\\/.:!]| ?[\\(',][Ppi](\\(e)?|([\\(-?']\\/))+( ?[\\(\\/\\dA-Znasieg]+)?)\\b( ?\\/? ?\\d+)?)|(\\bCT[L1i]\\b))", "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 12, "Syngenta Specific Laboratory keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-
-// --------------------------------------- PII rules -------------------------------------------------------------------
-
-
-rule "10: Redacted PII Personal Identification Information (Non vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $entity: RedactionEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 10, "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-
-
-rule "11: Redacted PII Personal Identification Information (Vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 11, "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "12: Redact Emails by RegEx (Non vertebrate study)"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $section: SectionNode(containsString("@"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 12, "Found by email regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "13: Redact Emails by RegEx (Vertebrate study)"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("@"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 13, "Found by email regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-
-rule "14: Redact line after contact information (Non vertebrate study)"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $string: String() from List.of("Contact point:",
-                                         "Contact:",
-                                         "Alternative contact:",
-                                         "European contact:",
-                                         "No:",
-                                         "Contact:",
-                                         "Tel.:",
-                                         "Tel:",
-                                         "Telephone number:",
-                                         "Telephone No:",
-                                         "Telephone:",
-                                         "Phone No:",
-                                         "Phone:",
-                                         "Fax number:",
-                                         "Fax:",
-                                         "E-mail:",
-                                         "Email:",
-                                         "e-mail:",
-                                         "E-mail address:")
-        $section: SectionNode(containsString($string))
-    then
-
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.lineAfterString($string, "PII", EntityType.ENTITY, $section));
-        setFields(entities, 14, "Found by contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-
-rule "15: Redact line after contact information (Vertebrate study)"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $string: String() from List.of("Contact point:",
-                                         "Contact:",
-                                         "Alternative contact:",
-                                         "European contact:",
-                                         "No:",
-                                         "Contact:",
-                                         "Tel.:",
-                                         "Tel:",
-                                         "Telephone number:",
-                                         "Telephone No:",
-                                         "Telephone:",
-                                         "Phone No:",
-                                         "Phone:",
-                                         "Fax number:",
-                                         "Fax:",
-                                         "E-mail:",
-                                         "Email:",
-                                         "e-mail:",
-                                         "E-mail address:")
-        $section: SectionNode(containsString($string))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString($string, "PII", EntityType.ENTITY, $section);
-        setFields(entities, 15, "Found by contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-
-rule "16: redact line between contact keywords"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
-    then
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section));
-        entities.addAll(entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section));
-        setFields(entities, 16, "Found between contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "17: redact line between contact keywords"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
-    then
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section));
-        entities.addAll(entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section));
-        setFields(entities, 17, "Found between contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "18: Redact Phone and Fax by RegEx"
-
-    when
-        $section: SectionNode(containsString("Contact") ||
-            containsString("Telephone") ||
-            containsString("Phone") ||
-            containsString("Fax") ||
-            containsString("Tel") ||
-            containsString("Ter") ||
-            containsString("Mobile") ||
-            containsString("Fel") ||
-            containsString("Fer"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 18, "Found by Phone and Fax regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
index d501c8b6..93b9c177 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl
@@ -14,8 +14,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.*
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.*
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.*
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.*
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
 import java.util.Set
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine
@@ -39,7 +39,7 @@ import java.util.Collection
 import java.util.stream.Stream
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
 
-global DocumentGraph document
+global Document document
 global ManualRedactionApplicationService manualRedactionApplicationService
 global Dictionary dictionary
 
@@ -72,7 +72,7 @@ rule "Apply id removals that are valid and not in forced redactions to Image"
     when
         IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
         not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
-        $imageEntityToBeRemoved: ImageNode($id == id)
+        $imageEntityToBeRemoved: Image($id == id)
     then
         $imageEntityToBeRemoved.setIgnored(true);
     end
@@ -92,7 +92,7 @@ rule "Apply image recategorization"
     salience 128
     when
         ManualImageRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $imageType: type)
-        $image: ImageNode($id == id)
+        $image: Image($id == id)
     then
         $image.setImageType(parseImageType($imageType));
     end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/merge_entity_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/merge_entity_rules.drl
deleted file mode 100644
index ed6e09aa..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/merge_entity_rules.drl
+++ /dev/null
@@ -1,101 +0,0 @@
-package drools
-
-import static java.lang.String.format;
-import static com.iqser.red.service.redaction.v1.server.document.services.CharSequenceSearchUtils.anyMatch;
-
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-import com.iqser.red.service.redaction.v1.server.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.document.graph.*
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.*
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.*
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import java.util.Set;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel
-import com.iqser.red.service.redaction.v1.server.layoutparsing.layout.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.layout.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-
-global DocumentGraph document
-global EntityCreationService entityCreationService
-global Dictionary dictionary
-
-query "getFileAttributes"
-    $fileAttribute: FileAttribute()
-    end
-
-rule "merge intersecting Entities of same type"
-    salience 100
-
-    when
-        $first: RedactionEntity($type: type, $entityType: entityType, !resized, !skipRemoveEntitiesContainedInLarger)
-        $second: RedactionEntity(intersects($first), type == $type, entityType == $entityType, this != $first, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $first.removeFromGraph();
-        $second.removeFromGraph();
-        RedactionEntity mergedEntity = entityCreationService.byEntities(List.of($first, $second), $type, $entityType, document);
-        insert(mergedEntity);
-        retract($first);
-        retract($second);
-    end
-
-rule "remove Entity of type ENTITY when contained by FALSE_POSITIVE"
-    salience 100
-
-    when
-        $falsePositive: RedactionEntity($type: type, entityType == EntityType.FALSE_POSITIVE)
-        entity: RedactionEntity(containedBy($falsePositive), type == $type, entityType == EntityType.ENTITY, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        entity.removeFromGraph();
-        retract(entity);
-    end
-
-rule "remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
-    salience 100
-
-    when
-        $falseRecommendation: RedactionEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION)
-        $recommendation: RedactionEntity(containedBy($falseRecommendation), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $recommendation.removeFromGraph();
-        retract($recommendation);
-    end
-
-rule "remove Entity of type RECOMMENDATION when contained by ENTITY"
-    salience 100
-
-    when
-        $entity: RedactionEntity($type: type, entityType == EntityType.ENTITY)
-        $recommendation: RedactionEntity(containedBy($entity), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $recommendation.removeFromGraph();
-        retract($recommendation);
-    end
-
-rule "remove Entity of lower rank, when equal boundaries and entityType"
-    salience 100
-
-    when
-        $higherRank: RedactionEntity($type: type, $entityType: entityType, $boundary: boundary)
-        $lowerRank: RedactionEntity($boundary == boundary, type != $type, entityType == $entityType, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type))
-    then
-        $lowerRank.removeFromGraph();
-        retract($lowerRank);
-    end
-
-rule "run local dictionary search"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    salience -999
-
-    when
-        DictionaryModel(!localEntries.isEmpty(), $type: type, $searchImplementation: localSearch) from dictionary.getDictionaryModels()
-    then
-        Set<RedactionEntity> redactionEntities = entityCreationService.bySearchImplementation($searchImplementation, $type, EntityType.RECOMMENDATION, document);
-        System.out.printf("local dictionary search found %d entities\n", redactionEntities.size());
-        redactionEntities.forEach(redactionEntity -> insert(redactionEntity));
-    end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules.drl
deleted file mode 100644
index 6090c41a..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules.drl
+++ /dev/null
@@ -1,383 +0,0 @@
-package drools
-
-import java.util.Set;
-
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
-
-global RedactionServiceSettings redactionServiceSettings;
-global Dictionary dictionary;
-
-
-// --------------------------------------- AI rules -------------------------------------------------------------------
-rule "-1: find entities from dictionary"
-    salience 100
-    no-loop true
-    when
-        section: Section()
-    then
-        section.findDictionaryEntities(dictionary, redactionServiceSettings);
-        update(section);
-     end
-
-rule "0: Add CBI_author from ai"
-    when
-        section: Section(aiMatchesType("CBI_author"))
-    then
-        section.addAiEntities("CBI_author", "CBI_author", dictionary);
-    end
-
-rule "0: Combine address parts from ai to CBI_address (org is mandatory)"
-    when
-        section: Section(aiMatchesType("ORG"))
-    then
-        section.combineAiTypes("ORG", "STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "CBI_address", 3, false, dictionary);
-    end
-
-rule "0: Combine address parts from ai to CBI_address (street is mandatory)"
-    when
-        section: Section(aiMatchesType("STREET"))
-    then
-        section.combineAiTypes("STREET", "ORG,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "CBI_address", 3, false, dictionary);
-    end
-
-rule "0: Combine address parts from ai to CBI_address (city is mandatory)"
-    when
-        section: Section(aiMatchesType("CITY"))
-    then
-        section.combineAiTypes("CITY", "ORG,STREET,POSTAL,COUNTRY,CARDINAL,STATE", 20, "CBI_address", 3, false, dictionary);
-    end
-
-
-// --------------------------------------- CBI rules -------------------------------------------------------------------
-
-rule "1: Redact CBI Authors (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_author"))
-    then
-        section.redact("CBI_author", 1, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
-    end
-
-rule "2: Redact CBI Authors (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_author"))
-    then
-        section.redact("CBI_author", 2, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "3: Redact not CBI Address (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_address"))
-    then
-        section.redactNot("CBI_address", 3, "Address found for non vertebrate study");
-        section.ignoreRecommendations("CBI_address");
-    end
-
-rule "4: Redact CBI Address (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_address"))
-    then
-        section.redact("CBI_address", 4, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "5: Do not redact genitive CBI_author"
-    when
-        section: Section(matchesType("CBI_author"))
-    then
-        section.expandToFalsePositiveByRegEx("CBI_author", "['’’'ʼˈ´`‘′ʻ’']s", false, 0, dictionary);
-    end
-
-
-rule "6: Redact Author(s) cells in Tables with Author(s) header (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author(s)") && !hasTableHeader("Vertebrate study Y/N"))
-    then
-        section.redactCell("Author(s)", 6, "CBI_author", false, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-rule "7: Redact Author(s) cells in Tables with Author(s) header (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author(s)") && !hasTableHeader("Vertebrate study Y/N"))
-    then
-        section.redactCell("Author(s)", 7, "CBI_author", false, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "8: Redact Author cells in Tables with Author header (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author") && !hasTableHeader("Vertebrate study Y/N"))
-    then
-        section.redactCell("Author", 8, "CBI_author", false, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-rule "9: Redact Author cells in Tables with Author header (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author") && !hasTableHeader("Vertebrate study Y/N"))
-    then
-        section.redactCell("Author", 9, "CBI_author", false, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "10: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes") || rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No")))
-    then
-        section.redactCell("Author(s)", 10, "CBI_author", true, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-rule "11: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes") || rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No")))
-    then
-        section.redactCell("Author(s)", 11, "CBI_author", true, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-rule "14: Redact and add recommendation for et al. author (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText contains "et al")
-    then
-        section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 14, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "15: Redact and add recommendation for et al. author (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText contains "et al")
-    then
-        section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 15, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-
-rule "16: Add recommendation for Addresses in Test Organism sections"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText (contains "Species:" &&  contains "Source:"))
-    then
-        section.recommendLineAfter("Source:", "CBI_address");
-    end
-
-rule "17: Add recommendation for Addresses in Test Animals sections"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText (contains "Species" &&  contains "Source") )
-    then
-        section.recommendLineAfter("Source", "CBI_address");
-    end
-
-/*
-
-rule "18: Do not redact Names and Addresses if Published Information found"
-    when
-        section: Section(matchesType("published_information"))
-    then
-        section.redactNotAndReference("CBI_author","published_information", 18, "Published Information found");
-        section.redactNotAndReference("CBI_address","published_information", 18, "Published Information found");
-    end
-
-*/
-
-// --------------------------------------- PII rules -------------------------------------------------------------------
-
-
-rule "19: Redacted PII Personal Identification Information (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("PII"))
-    then
-        section.redact("PII", 19, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
-    end
-
-rule "20: Redacted PII Personal Identification Information (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("PII"))
-    then
-        section.redact("PII", 20, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "21: Redact Emails by RegEx (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText contains "@")
-    then
-        section.redactByRegEx("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", true, 1, "PII", 21, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "22: Redact Emails by RegEx (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText contains "@")
-    then
-        section.redactByRegEx("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", true, 1, "PII", 22, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-    end
-
-
-rule "23: Redact contact information (Non vertebrate study)"
-    when
-       section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study", "Yes") &&
-       (text (contains "Contact point:" ||
-       contains "Contact:" ||
-       contains "Alternative contact:" ||
-       (contains "No:" && contains "Fax") ||
-       (contains "Contact:" && contains "Tel.:") ||
-       contains "European contact:")))
-    then
-        section.redactLineAfter("Contact point:", "PII", 23, true, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 23, true, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Alternative contact:", "PII", 23, true, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 23, true, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("Contact:", "Tel.:", "PII", 23, true, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("European contact:",  "PII", 23, true, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-     end
-
-rule "24: Redact contact information (Vertebrate study)"
-    when
-       section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") &&
-       (text (contains "Contact point:"
-            || contains "Contact:"
-            || contains"Alternative contact:"
-            || (contains "No:" &&  contains "Fax")
-            || (contains "Contact:" && contains "Tel.:")
-            || contains "European contact:"
-        )))
-    then
-        section.redactLineAfter("Contact point:", "PII", 24, true, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 24, true, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Alternative contact:", "PII", 24, true, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 24, true, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("Contact:", "Tel.:", "PII", 24, true, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("European contact:",  "PII", 24, true, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-     end
-
-rule "25: Redact Phone and Fax by RegEx (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (
-               text contains "Contact"
-            || contains "Telephone"
-            || contains "Phone"
-            || contains "Fax"
-            || contains "Tel"
-            || contains "Ter"
-            || contains "Mobile"
-            || contains "Fel"
-            || contains "Fer"
-        ))
-    then
-        section.redactByRegEx("\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", true, 2, "PII", 25, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "26: Redact Phone and Fax by RegEx (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && ( 
-            text contains "Contact"
-            || contains "Telephone"
-            || contains "Phone"
-            || contains "Fax"
-            || contains "Tel"
-            || contains "Ter"
-            || contains "Mobile"
-            || contains "Fel"
-            || contains "Fer"
-        ))
-    then
-        section.redactByRegEx("\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", true, 2, "PII", 26, "Personal information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "27: Redact AUTHOR(S) (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes")
-            && (searchText contains "AUTHOR(S):"
-            && contains "COMPLETION DATE:"
-            && not contains "STUDY COMPLETION DATE:")
-        )
-    then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 27, true, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "28: Redact AUTHOR(S) (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes")
-            && (searchText contains "AUTHOR(S):"
-            && contains "COMPLETION DATE:"
-            && not contains "STUDY COMPLETION DATE:")
-        )
-    then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 28, true, "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-
-rule "29: Redact AUTHOR(S) (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes")
-            && (searchText contains "AUTHOR(S):"
-            && contains "STUDY COMPLETION DATE:")
-        )
-    then
-        section.redactLinesBetween("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", 29, true, "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "30: Redact AUTHOR(S) (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes")
-            && searchText contains "AUTHOR(S):"
-            && contains "STUDY COMPLETION DATE:"
-        )
-    then
-        section.redactLinesBetween("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", 30, true, "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-
-rule "31: Redact PERFORMING LABORATORY (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes")
-            && searchText contains "PERFORMING LABORATORY:"
-        )
-    then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", 31, true, "PERFORMING LABORATORY was found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-        section.redactNot("CBI_address", 31, "Performing laboratory found for non vertebrate study");
-    end
-
-rule "32: Redact PERFORMING LABORATORY (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes")
-            && searchText contains "PERFORMING LABORATORY:")
-    then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", 32, true, "PERFORMING LABORATORY was found", "Article 39(e)(2) of Regulation (EC) No 178/2002", dictionary);
-    end
-
-rule "33: Redact study director abbreviation"
-    when
-        section: Section(searchText contains "KATH" || contains "BECH" || contains "KML")
-    then
-        section.redactWordPartByRegEx("((KATH)|(BECH)|(KML)) ?(\\d{4})", true, 0, 1, "PII", 34, "Personal information found", "Article 39(e)(3) of Regulation (EC) No 178/2002", dictionary);
-     end
-
-
-// --------------------------------------- other rules -------------------------------------------------------------------
-
-rule "34: Purity Hint"
-    when
-        section: Section(searchText.toLowerCase() contains "purity")
-    then
-	    section.addHintAnnotationByRegEx("(purity ?( of|\\(.{1,20}\\))?( ?:)?) .{0,5}[\\d\\.]+( .{0,4}\\.)? ?%", true, 1, "hint_only",dictionary);
-    end
-
-
-
-rule "35: Redact signatures (Non vertebrate study)"
-    when
-        section: Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesImageType("signature"))
-    then
-        section.redactImage("signature", 35, "Signature found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
-    end
-
-rule "36: Redact signatures (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesImageType("signature"))
-    then
-        section.redactImage("signature", 36, "Signature found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "43: Redact Logos (Vertebrate study)"
-    when
-        section: Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesImageType("logo"))
-    then
-        section.redactImage("logo", 43, "Logo found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
-    end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules_new.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules_new.drl
deleted file mode 100644
index a68fe2a7..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_rules_new.drl
+++ /dev/null
@@ -1,479 +0,0 @@
-package drools
-
-import static java.lang.String.format;
-import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.CharSequenceSearchUtils.anyMatch;
-import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityEnrichmentService.setFields;
-import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.PropertiesMapper.parseImageType;
-
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.*
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.*
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.*
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.*
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import java.util.Set
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.ManualRedactionApplicationService;
-import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
-
-global DocumentGraph document
-global EntityCreationService entityCreationService
-global ManualRedactionApplicationService manualRedactionApplicationService
-global Dictionary dictionary
-
-// --------------------------------------- queries -------------------------------------------------------------------
-
-query "getFileAttributes"
-    $fileAttribute: FileAttribute()
-    end
-
-// --------------------------------------- manual redaction rules -------------------------------------------------------------------
-
-rule "Apply manual resize redaction"
-    salience 200
-    when
-        $resizeRedactions: ManualResizeRedaction($id: annotationId)
-        $entityToBeResized: RedactionEntity(matchesAnnotationId($id))
-    then
-        manualRedactionApplicationService.resizeEntityAndReinsert($entityToBeResized, $resizeRedactions);
-        retract($resizeRedactions);
-        update($entityToBeResized);
-    end
-
-rule "Apply id removals that are valid and not in forced redactions to Entity"
-    salience 200
-    when
-        IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
-        not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
-        $entityToBeRemoved: RedactionEntity(matchesAnnotationId($id))
-    then
-        $entityToBeRemoved.removeFromGraph();
-        retract($entityToBeRemoved);
-    end
-
-rule "Apply id removals that are valid and not in forced redactions to Image"
-    salience 200
-    when
-        IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
-        not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
-        $entityToBeRemoved: ImageNode($id == id)
-    then
-        $entityToBeRemoved.setIgnored(true);
-    end
-
-rule "Apply force redaction"
-    salience 200
-    when
-        ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED, requestDate != null, $legalBasis: legalBasis)
-        $entityToForce: RedactionEntity(matchesAnnotationId($id))
-    then
-        $entityToForce.setLegalBasis($legalBasis);
-        $entityToForce.setRedaction(true);
-        $entityToForce.setSkipRemoveEntitiesContainedInLarger(true);
-    end
-
-rule "Apply image recategorization"
-    salience 200
-    when
-        ManualImageRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $imageType: type)
-        $image: ImageNode($id == id)
-    then
-        $image.setImageType(parseImageType($imageType));
-    end
-
-// --------------------------------------- merging rules -------------------------------------------------------------------
-
-rule "merge intersecting Entities of same type"
-    salience 100
-    when
-        $first: RedactionEntity($type: type, $entityType: entityType, !resized, !skipRemoveEntitiesContainedInLarger)
-        $second: RedactionEntity(intersects($first), type == $type, entityType == $entityType, this != $first, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $first.removeFromGraph();
-        $second.removeFromGraph();
-        RedactionEntity mergedEntity = entityCreationService.byEntities(List.of($first, $second), $type, $entityType, document);
-        retract($first);
-        retract($second);
-        insert(mergedEntity);
-    end
-
-rule "remove Entity of type ENTITY when contained by FALSE_POSITIVE"
-    salience 100
-    when
-        $falsePositive: RedactionEntity($type: type, entityType == EntityType.FALSE_POSITIVE)
-        $entity: RedactionEntity(containedBy($falsePositive), type == $type, entityType == EntityType.ENTITY, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $entity.removeFromGraph();
-        retract($entity);
-    end
-
-rule "remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
-    salience 100
-    when
-        $falseRecommendation: RedactionEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION)
-        $recommendation: RedactionEntity(containedBy($falseRecommendation), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $recommendation.removeFromGraph();
-        retract($recommendation);
-    end
-
-rule "remove Entity of type RECOMMENDATION when contained by ENTITY"
-    salience 100
-    when
-        $entity: RedactionEntity($type: type, entityType == EntityType.ENTITY)
-        $recommendation: RedactionEntity(containedBy($entity), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $recommendation.removeFromGraph();
-        retract($recommendation);
-    end
-
-rule "remove Entity of lower rank, when equal boundaries and entityType"
-    salience 100
-    when
-        $higherRank: RedactionEntity($type: type, $entityType: entityType, $boundary: boundary)
-        $lowerRank: RedactionEntity($boundary == boundary, type != $type, entityType == $entityType, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type))
-    then
-        $lowerRank.removeFromGraph();
-        retract($lowerRank);
-    end
-
-// --------------------------------------- local dictionary search -------------------------------------------------------------------
-
-rule "run local dictionary search"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    salience -999
-    when
-        DictionaryModel(!localEntries.isEmpty(), $type: type, $searchImplementation: localSearch) from dictionary.getDictionaryModels()
-    then
-        Set<RedactionEntity> redactionEntities = entityCreationService.bySearchImplementation($searchImplementation, $type, EntityType.RECOMMENDATION, document);
-        System.out.printf("local dictionary search found %d entities\n", redactionEntities.size());
-        redactionEntities.forEach(redactionEntity -> insert(redactionEntity));
-    end
-
-// --------------------------------------- NER Entities rules -------------------------------------------------------------------
-
-rule "add NER Entities of type CBI_author or CBI_address"
-    when
-        $nerEntity: EntityRecognitionEntity($type: type, (type == "CBI_author" || type == "CBI_address"))
-    then
-        RedactionEntity redactionEntity = entityCreationService.byBoundary(new Boundary($nerEntity.getStartOffset(), $nerEntity.getEndOffset()), $type, EntityType.RECOMMENDATION, document);
-        insert(redactionEntity);
-    end
-
-// --------------------------------------- CBI rules -------------------------------------------------------------------
-
-rule "0: Expand CBI_author and PII matches with salutation prefix"
-    when
-        $entityToExpand: RedactionEntity((type == "CBI_author" || type == "PII"), anyMatch(textBefore, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*"))
-    then
-        RedactionEntity entity = entityCreationService.byPrefixExpansionRegex($entityToExpand, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*");
-        setFields(entity, 0, null, null, Engine.RULE);
-        insert(entity);
-    end
-
-rule "1: Redact CBI Authors (Non vertebrate study)"
-    no-loop true
-    when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 1, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "2: Redact CBI Authors (Vertebrate study)"
-    no-loop true
-    when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 2, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "3: Don't redact CBI Address (Non vertebrate study)"
-    no-loop true
-    when
-        not FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_address", entityType == EntityType.ENTITY)
-    then
-        setFields($entity, 3, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "4: Redact CBI Address (Vertebrate study)"
-    no-loop true
-    when
-        FileAttribute(label == "Vertebrate Study", value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_address", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 4, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "5: Add FALSE_POSITIVE Entity for genitive CBI_author"
-    when
-        $entity: RedactionEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"), redaction)
-    then
-        RedactionEntity falsePositive = entityCreationService.byBoundary($entity.getBoundary(), "CBI_author", EntityType.FALSE_POSITIVE, document);
-        setFields(falsePositive, 5, "Genitive Author", null, Engine.RULE);
-        insert(falsePositive);
-    end
-
-rule "6: Create Entity from Author(s) cells in Tables with Author(s) header and add Authorname as Recommendation"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    when
-        authorCell: TableCellNode(!header, (hasHeader("Author(s)") || hasHeader("Author")), hasText())
-    then
-        RedactionEntity entity = entityCreationService.bySemanticNode(authorCell, "CBI_author", EntityType.ENTITY);
-        setFields(entity, 6, "Header Author(s) found", null, Engine.RULE);
-        insert(entity);
-        dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), true);
-    end
-
-rule "7: Add CBI_author with \"et al.\" Regex"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    when
-         $section: SectionNode(containsString("et al."))
-    then
-         Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, $section);
-         setFields(entities, 7, "Found by \"et al.\" regex", null, Engine.RULE);
-         entities.forEach(entity -> insert(entity));
-         entities.forEach(entity -> dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), false));
-    end
-
-rule "8: Add recommendation for Addresses in Test Organism sections"
-    when
-        //FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString("Source",  "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 8, "Line after \"Source\" in Test Organism Section", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "9: Add recommendation for Addresses in Test Animals sections"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("Species:") && containsString("Source:"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString("Source:", "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 9, "Line after \"Source:\" in Test Organism Section", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "12: Recommend CTL/BL laboratory that start with BL or CTL"
-    when
-        $section : SectionNode(containsString("BL") || containsString("CT"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("((\\b((([Cc]T(([1ILli\\/])| L|~P))|(BL))[\\. ]?([\\dA-Ziltphz~\\/.:!]| ?[\\(',][Ppi](\\(e)?|([\\(-?']\\/))+( ?[\\(\\/\\dA-Znasieg]+)?)\\b( ?\\/? ?\\d+)?)|(\\bCT[L1i]\\b))", "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 12, "Syngenta Specific Laboratory keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-// --------------------------------------- PII rules -------------------------------------------------------------------
-
-
-rule "10: Redacted PII Personal Identification Information (Non vertebrate study)"
-    no-loop true
-    when
-        not FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $entity: RedactionEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 10, "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "11: Redacted PII Personal Identification Information (Vertebrate study)"
-    no-loop true
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 11, "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "12: Redact Emails by RegEx (Non vertebrate study)"
-    when
-        not FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $section: SectionNode(containsString("@"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 12, "Found by email regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "13: Redact Emails by RegEx (Vertebrate study)"
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("@"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 13, "Found by email regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "14: Redact line after contact information (Non vertebrate study)"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    when
-        not FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $string: String() from List.of("Contact point:",
-                                         "Contact:",
-                                         "Alternative contact:",
-                                         "European contact:",
-                                         "No:",
-                                         "Contact:",
-                                         "Tel.:",
-                                         "Tel:",
-                                         "Telephone number:",
-                                         "Telephone No:",
-                                         "Telephone:",
-                                         "Phone No.",
-                                         "Phone:",
-                                         "Fax number:",
-                                         "Fax:",
-                                         "E-mail:",
-                                         "Email:",
-                                         "e-mail:",
-                                         "E-mail address:")
-        $section: SectionNode(containsString($string))
-    then
-
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.lineAfterString($string, "PII", EntityType.ENTITY, $section));
-        setFields(entities, 14, "Found by contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "15: Redact line after contact information (Vertebrate study)"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $string: String() from List.of("Contact point:",
-                                         "Contact:",
-                                         "Alternative contact:",
-                                         "European contact:",
-                                         "No:",
-                                         "Contact:",
-                                         "Tel.:",
-                                         "Tel:",
-                                         "Telephone number:",
-                                         "Telephone No:",
-                                         "Telephone:",
-                                         "Phone No.",
-                                         "Phone:",
-                                         "Fax number:",
-                                         "Fax:",
-                                         "E-mail:",
-                                         "Email:",
-                                         "e-mail:",
-                                         "E-mail address:")
-        $section: SectionNode(containsString($string))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString($string, "PII", EntityType.ENTITY, $section);
-        setFields(entities, 15, "Found by contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "16: redact line between contact keywords"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    when
-        not FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
-    then
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section));
-        entities.addAll(entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section));
-        setFields(entities, 16, "Found between contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "17: redact line between contact keywords"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
-    then
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section));
-        entities.addAll(entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section));
-        setFields(entities, 17, "Found between contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "18: Redact Phone and Fax by RegEx"
-    when
-        $section: SectionNode(containsString("Contact") ||
-            containsString("Telephone") ||
-            containsString("Phone") ||
-            containsString("Fax") ||
-            containsString("Tel") ||
-            containsString("Ter") ||
-            containsString("Mobile") ||
-            containsString("Fel") ||
-            containsString("Fer"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 18, "Found by Phone and Fax regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-// --------------------------------------- Image rules -------------------------------------------------------------------
-
-rule "19: Redact signatures"
-    when
-        $signature: ImageNode(imageType == ImageType.SIGNATURE)
-    then
-        $signature.setRedaction(true);
-        $signature.setRedactionReason("Signature Found");
-        $signature.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-rule "20: Redact formulas"
-    when
-        $signature: ImageNode(imageType == ImageType.FORMULA)
-    then
-        $signature.setRedaction(true);
-        $signature.setRedactionReason("Formula Found");
-        $signature.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-rule "20: Redact logos"
-    when
-        $signature: ImageNode(imageType == ImageType.LOGO)
-    then
-        $signature.setRedaction(true);
-        $signature.setRedactionReason("Logo Found");
-        $signature.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
\ No newline at end of file
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta.drl
deleted file mode 100644
index e69de29b..00000000
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta_new.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta_new.drl
index 41ff4f74..c22d37ea 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta_new.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/prod_syngenta_new.drl
@@ -14,8 +14,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.*;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
 import java.util.Set
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
@@ -39,7 +39,7 @@ import java.util.Collection;
 import java.util.stream.Stream;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
 
-global DocumentGraph document
+global Document document
 global EntityCreationService entityCreationService
 global ManualRedactionApplicationService manualRedactionApplicationService
 global NerEntitiesAdapter nerEntitiesAdapter
@@ -55,7 +55,7 @@ query "getFileAttributes"
 
 rule "0: Recommend CTL/BL laboratory that start with BL or CTL"
     when
-        $section: SectionNode(containsString("CT") || containsString("BL"))
+        $section: Section(containsString("CT") || containsString("BL"))
     then
         /* Regular expression: ((\b((([Cc]T(([1ILli\/])| L|~P))|(BL))[\. ]?([\dA-Ziltphz~\/.:!]| ?[\(',][Ppi](\(e)?|([\(-?']\/))+( ?[\(\/\dA-Znasieg]+)?)\b( ?\/? ?\d+)?)|(\bCT[L1i]\b)) */
         entityCreationService.byRegexIgnoreCase("((\\b((([Cc]T(([1ILli\\/])| L|~P))|(BL))[\\. ]?([\\dA-Ziltphz~\\/.:!]| ?[\\(',][Ppi](\\(e)?|([\\(-?']\\/))+( ?[\\(\\/\\dA-Znasieg]+)?)\\b( ?\\/? ?\\d+)?)|(\\bCT[L1i]\\b))", "CBI_address", EntityType.RECOMMENDATION, $section)
@@ -110,7 +110,7 @@ rule "5: Add FALSE_POSITIVE Entity for genitive CBI_author"
 
 rule "6: Redact all Cell's with Header Author(s) as CBI_author"
     when
-        $table: TableNode(hasHeader("Author(s)"))
+        $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
@@ -127,7 +127,7 @@ rule "6: Redact all Cell's with Header Author(s) as CBI_author"
 rule "8: Redact all Cell's with Header Author(s) as CBI_author"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $table: TableNode(hasHeader("Author"))
+        $table: Table(hasHeader("Author"))
     then
         $table.streamTableCellsWithHeader("Author")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
@@ -144,7 +144,7 @@ rule "8: Redact all Cell's with Header Author(s) as CBI_author"
 rule "10: Recommend all CBI_author entities in Table with Vertebrate Study Y/N Header"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $table: TableNode(hasHeader("Author(s)") && hasHeader("Vertebrate Study Y/N"))
+        $table: Table(hasHeader("Author(s)") && hasHeader("Vertebrate Study Y/N"))
     then
         $table.getEntitiesOfType("CBI_author").forEach(entity -> dictionary.addMultipleAuthorsAsRecommendation(entity));
     end
@@ -152,7 +152,7 @@ rule "10: Recommend all CBI_author entities in Table with Vertebrate Study Y/N H
 rule "14: Add CBI_author with \"et al.\" Regex"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-         $section: SectionNode(containsString("et al."))
+         $section: Section(containsString("et al."))
     then
          entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, $section)
             .forEach(entity -> {
@@ -168,7 +168,7 @@ rule "14: Add CBI_author with \"et al.\" Regex"
 
 rule "16: Add recommendation for Addresses in Test Organism sections"
     when
-        $section: SectionNode(excludesTables, containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
+        $section: Section(excludesTables, containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
     then
         entityCreationService.lineAfterString("Source",  "CBI_address", EntityType.RECOMMENDATION, $section)
             .forEach(entity -> {
@@ -181,7 +181,7 @@ rule "16: Add recommendation for Addresses in Test Organism sections"
 
 rule "17: Add recommendation for Addresses in Test Animals sections"
     when
-        $section: SectionNode(excludesTables, containsString("Species:"), containsString("Source:"))
+        $section: Section(excludesTables, containsString("Species:"), containsString("Source:"))
     then
         entityCreationService.lineAfterString("Source:",  "CBI_address", EntityType.RECOMMENDATION, $section)
             .forEach(entity -> {
@@ -192,27 +192,24 @@ rule "17: Add recommendation for Addresses in Test Animals sections"
             });
     end
 
-rule "18: Do not redact Names and Addresses if published information found in section without tables"
+rule "18.0: Do not redact Names and Addresses if published information found in section without tables"
     when
-        $section: SectionNode(excludesTables &&
-                              hasEntitiesOfType("published_information"),
+        $section: Paragraph(hasEntitiesOfType("published_information"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        List<RedactionEntity>  publishedInformationEntities = $section.getEntitiesOfType("published_information");
         $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
             .forEach(redactionEntity -> {
                 redactionEntity.setRedaction(false);
                 redactionEntity.setRedactionReason("Published Information found");
-                redactionEntity.addReferences(publishedInformationEntities);
+                redactionEntity.addReferences($section.getEntitiesOfType("published_information"));
             });
     end
 
-rule "18.0: Do not redact Names and Addresses if published information found in same table row"
+rule "18.1: Do not redact Names and Addresses if published information found in same table row"
     when
-        $table: TableNode(hasEntitiesOfType("published_information"),
+        $table: Table(hasEntitiesOfType("published_information"),
                          (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-
         $table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address"))
             .forEach(redactionEntity -> {
                 redactionEntity.setRedaction(false);
@@ -221,6 +218,8 @@ rule "18.0: Do not redact Names and Addresses if published information found in
             });
     end
 
+
+
 // --------------------------------------- PII rules -------------------------------------------------------------------
 
 rule "19: Redact all PII"
@@ -235,7 +234,7 @@ rule "19: Redact all PII"
 
 rule "21: Redact Emails by RegEx (Non vertebrate study)"
     when
-        $section: SectionNode(containsString("@"))
+        $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, 1, $section)
             .forEach(emailEntity -> {
@@ -250,7 +249,7 @@ rule "21: Redact Emails by RegEx (Non vertebrate study)"
 
 rule "25: Redact Phone and Fax by RegEx"
     when
-        $section: SectionNode(containsString("Contact") ||
+        $section: Section(containsString("Contact") ||
                               containsString("Telephone") ||
                               containsString("Phone") ||
                               containsString("Ph.") ||
@@ -261,7 +260,30 @@ rule "25: Redact Phone and Fax by RegEx"
                               containsString("Fel") ||
                               containsString("Fer"))
     then
-        entityCreationService.byRegex("\\b(contact|telephone|phone|ph\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, 2, $section)
+        entityCreationService.byRegexIgnoreCase("\\b(contact|telephone|phone|ph\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, 2, $section)
+            .forEach(contactEntity -> {
+                contactEntity.setRedaction(true);
+                contactEntity.setRedactionReason("Found by Email Regex");
+                contactEntity.setLegalBasis("Article 39(e)(3) of Regulation (EC) No 178/2002");
+                contactEntity.addMatchedRule(26);
+                insert(contactEntity);
+            });
+    end
+
+rule "25: Redact Phone and Fax by RegEx"
+    when
+        $section: Section(containsString("Contact") ||
+                              containsString("Telephone") ||
+                              containsString("Phone") ||
+                              containsString("Ph.") ||
+                              containsString("Fax") ||
+                              containsString("Tel") ||
+                              containsString("Ter") ||
+                              containsString("Mobile") ||
+                              containsString("Fel") ||
+                              containsString("Fer"))
+    then
+        entityCreationService.byRegexIgnoreCase("\\b(contact|telephone|phone|ph\\.|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, 2, $section)
             .forEach(contactEntity -> {
                 contactEntity.setRedaction(true);
                 contactEntity.setRedactionReason("Found by Email Regex");
@@ -274,7 +296,7 @@ rule "25: Redact Phone and Fax by RegEx"
 
 rule "27: Redact AUTHOR(S)"
     when
-        $section: SectionNode(excludesTables, containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"), !containsString("STUDY COMPLETION DATE:"))
+        $section: Section(excludesTables, containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"), !containsString("STUDY COMPLETION DATE:"))
     then
         entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
          .forEach(authorEntity -> {
@@ -289,7 +311,7 @@ rule "27: Redact AUTHOR(S)"
 
 rule "29: Redact AUTHOR(S)"
     when
-        $section: SectionNode(excludesTables, containsString("AUTHOR(S):"), containsString("STUDY COMPLETION DATE:"))
+        $section: Section(excludesTables, containsString("AUTHOR(S):"), containsString("STUDY COMPLETION DATE:"))
     then
         entityCreationService.betweenStrings("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
          .forEach(authorEntity -> {
@@ -304,7 +326,7 @@ rule "29: Redact AUTHOR(S)"
 rule "31: Redact PERFORMING LABORATORY (Non vertebrate study)"
     when
         not FileAttribute(label == "Vertebrate Study", value == "Yes")
-        $section: SectionNode(excludesTables, containsString("PERFORMING LABORATORY:"))
+        $section: Section(excludesTables, containsString("PERFORMING LABORATORY:"))
     then
         entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
          .forEach(laboratoryEntity -> {
@@ -319,7 +341,7 @@ rule "31: Redact PERFORMING LABORATORY (Non vertebrate study)"
 rule "32: Redact PERFORMING LABORATORY (Vertebrate study)"
     when
         FileAttribute(label == "Vertebrate Study", value == "Yes")
-        $section: SectionNode(excludesTables, containsString("PERFORMING LABORATORY:"))
+        $section: Section(excludesTables, containsString("PERFORMING LABORATORY:"))
     then
         entityCreationService.betweenStrings("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", EntityType.ENTITY, $section)
          .forEach(laboratoryEntity -> {
@@ -336,7 +358,7 @@ rule "32: Redact PERFORMING LABORATORY (Vertebrate study)"
 
 rule "33: Purity Hint"
     when
-        $section: SectionNode(containsStringIgnoreCase("purity"))
+        $section: Section(containsStringIgnoreCase("purity"))
     then
         entityCreationService.byRegexIgnoreCase("(purity ?( of|\\(.{1,20}\\))?( ?:)?) .{0,5}[\\d\\.]+( .{0,4}\\.)? ?%", "hint_only", EntityType.ENTITY, 1, $section)
             .forEach(hint -> {
@@ -348,7 +370,7 @@ rule "33: Purity Hint"
 rule "34: Redact signatures (not Vertebrate Study)"
     when
         not FileAttribute(label == "Vertebrate Study", value == "Yes")
-        $signature: ImageNode(imageType == ImageType.SIGNATURE)
+        $signature: Image(imageType == ImageType.SIGNATURE)
     then
         $signature.setRedaction(true);
         $signature.setMatchedRule(34);
@@ -359,7 +381,7 @@ rule "34: Redact signatures (not Vertebrate Study)"
 rule "35: Redact signatures (Vertebrate Study)"
     when
         FileAttribute(label == "Vertebrate Study", value == "Yes")
-        $signature: ImageNode(imageType == ImageType.SIGNATURE)
+        $signature: Image(imageType == ImageType.SIGNATURE)
     then
         $signature.setRedaction(true);
         $signature.setMatchedRule(35);
@@ -370,7 +392,7 @@ rule "35: Redact signatures (Vertebrate Study)"
 
 rule "36: Redact logos"
     when
-        $logo: ImageNode(imageType == ImageType.LOGO)
+        $logo: Image(imageType == ImageType.LOGO)
     then
         $logo.setRedaction(true);
         $logo.setMatchedRule(36);
@@ -432,7 +454,7 @@ rule "Apply id removals that are valid and not in forced redactions to Image"
     when
         IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
         not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
-        $entityToBeRemoved: ImageNode($id == id)
+        $entityToBeRemoved: Image($id == id)
     then
         $entityToBeRemoved.setIgnored(true);
     end
@@ -452,7 +474,7 @@ rule "Apply image recategorization"
     salience 128
     when
         ManualImageRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $imageType: type)
-        $image: ImageNode($id == id)
+        $image: Image($id == id)
     then
         $image.setImageType(parseImageType($imageType));
     end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
index e55bd78b..db4042a3 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl
@@ -14,8 +14,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.*;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
 import java.util.Set
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
@@ -39,7 +39,7 @@ import java.util.Collection;
 import java.util.stream.Stream;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
 
-global DocumentGraph document
+global Document document
 global EntityCreationService entityCreationService
 global ManualRedactionApplicationService manualRedactionApplicationService
 global NerEntitiesAdapter nerEntitiesAdapter
@@ -80,7 +80,7 @@ rule "0: Expand CBI_author and PII entities with salutation prefix"
 
 rule "1: Redacted because Section contains Vertebrate"
     when
-        $section: SectionNode(hasEntitiesOfType("vertebrate"),
+        $section: Section(hasEntitiesOfType("vertebrate"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
@@ -94,7 +94,7 @@ rule "1: Redacted because Section contains Vertebrate"
 
 rule "2: Not Redacted because Section contains no Vertebrate"
     when
-        $section: SectionNode(!hasEntitiesOfType("vertebrate"),
+        $section: Section(!hasEntitiesOfType("vertebrate"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
@@ -107,7 +107,7 @@ rule "2: Not Redacted because Section contains no Vertebrate"
 
 rule "3: Do not redact Names and Addresses if no redaction Indicator is contained"
     when
-        $section: SectionNode(hasEntitiesOfType("vertebrate"),
+        $section: Section(hasEntitiesOfType("vertebrate"),
                               hasEntitiesOfType("no_redaction_indicator"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
@@ -121,7 +121,7 @@ rule "3: Do not redact Names and Addresses if no redaction Indicator is containe
 
 rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
     when
-        $section: SectionNode(hasEntitiesOfType("vertebrate"),
+        $section: Section(hasEntitiesOfType("vertebrate"),
                               hasEntitiesOfType("no_redaction_indicator"),
                               hasEntitiesOfType("redaction_indicator"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
@@ -138,7 +138,7 @@ rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indi
 rule "5: Do not redact Names and Addresses if published information found"
 
     when
-        $section: SectionNode(hasEntitiesOfType("vertebrate"),
+        $section: Section(hasEntitiesOfType("vertebrate"),
                               hasEntitiesOfType("published_information"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
@@ -153,7 +153,7 @@ rule "5: Do not redact Names and Addresses if published information found"
 
 rule "6.0: Add all Cell's with Header Author(s) as CBI_author"
     when
-        $table: TableNode(hasHeader("Author(s)"))
+        $table: Table(hasHeader("Author(s)"))
     then
         $table.streamTableCellsWithHeader("Author(s)")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
@@ -166,7 +166,7 @@ rule "6.0: Add all Cell's with Header Author(s) as CBI_author"
 
 rule "6.1: Dont redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value No"
     when
-        $table: TableNode(hasRowWithHeaderAndValue("Vertebrate study Y/N", "N") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "No"))
+        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "N") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "No"))
     then
         $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("N", "No"))
             .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
@@ -180,7 +180,7 @@ rule "6.1: Dont redact CBI_author, if its row contains a cell with header \"Vert
 
 rule "7: Redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value Yes"
     when
-        $table: TableNode(hasRowWithHeaderAndValue("Vertebrate study Y/N", "Y") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "Yes"))
+        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "Y") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "Yes"))
     then
         $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("Y", "Yes"))
             .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
@@ -194,7 +194,7 @@ rule "7: Redact CBI_author, if its row contains a cell with header \"Vertebrate
 
 rule "8: Redact if must_redact entity is found"
     when
-        $section: SectionNode(hasEntitiesOfType("must_redact"),
+        $section: Section(hasEntitiesOfType("must_redact"),
                              (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
@@ -228,7 +228,7 @@ rule "10: Redact row if row contains \"determination of residues\" and livestock
                                         "ruminant",
                                         "ruminants")
         $residueKeyword: String() from List.of("determination of residues", "determination of total residues")
-        $table: TableNode(containsStringIgnoreCase($residueKeyword)
+        $table: Table(containsStringIgnoreCase($residueKeyword)
                             && containsStringIgnoreCase($keyword))
     then
         entityCreationService.byString($keyword, "must_redact", EntityType.ENTITY, $table)
@@ -246,7 +246,7 @@ rule "10: Redact row if row contains \"determination of residues\" and livestock
 
 rule "11: Redact if CTL/* or BL/*  was found"
     when
-        $section: SectionNode(excludesTables, (containsString("CTL/") || containsString("BL/")))
+        $section: Section(excludesTables, (containsString("CTL/") || containsString("BL/")))
     then
         entityCreationService.byString("CTL/", "must_redact", EntityType.ENTITY, $section)
             .forEach(mustRedactEntity -> insert(mustRedactEntity));
@@ -265,7 +265,7 @@ rule "11: Redact if CTL/* or BL/*  was found"
 rule "12: Add CBI_author with \"et al.\" Regex"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-         $section: SectionNode(containsString("et al."))
+         $section: Section(containsString("et al."))
     then
          entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, $section)
             .forEach(entity -> {
@@ -280,7 +280,7 @@ rule "12: Add CBI_author with \"et al.\" Regex"
 
 rule "13: Add recommendation for Addresses in Test Organism sections"
     when
-        $section: SectionNode(excludesTables, containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
+        $section: Section(excludesTables, containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
     then
         entityCreationService.lineAfterString("Source",  "CBI_address", EntityType.RECOMMENDATION, $section)
             .forEach(redactionEntity -> {
@@ -293,7 +293,7 @@ rule "13: Add recommendation for Addresses in Test Organism sections"
 rule "14: Add recommendation for Addresses in Test Animals sections"
 
     when
-        $section: SectionNode(excludesTables, containsString("Species:"), containsString("Source:"))
+        $section: Section(excludesTables, containsString("Species:"), containsString("Source:"))
     then
         entityCreationService.lineAfterString("Source:",  "CBI_address", EntityType.RECOMMENDATION, $section)
             .forEach(redactionEntity -> {
@@ -317,7 +317,7 @@ rule "15: Redact all PII"
 
 rule "16: Redact Emails by RegEx (Non vertebrate study)"
     when
-        $section: SectionNode(containsString("@"))
+        $section: Section(containsString("@"))
     then
         entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section)
             .forEach(emailEntity -> {
@@ -351,7 +351,7 @@ rule "17: Redact line after contact information keywords"
                                          "Email:",
                                          "e-mail:",
                                          "E-mail address:")
-        $section: SectionNode(containsString($contactKeyword))
+        $section: Section(containsString($contactKeyword))
     then
         entityCreationService.lineAfterString($contactKeyword, "PII", EntityType.ENTITY, $section)
             .forEach(contactEntity -> {
@@ -368,7 +368,7 @@ rule "17: Redact line after contact information keywords"
 rule "18: redact line between contact keywords"
     agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
+        $section: Section((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
     then
         Stream.concat(
             entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
@@ -387,7 +387,7 @@ rule "18: redact line between contact keywords"
 rule "19: Redact AUTHOR(S)"
     when
         FileAttribute(placeholder == "{fileattributes.vertebrateStudy}", value == "true")
-        $section: SectionNode(excludesTables, containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"))
+        $section: Section(excludesTables, containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"))
     then
         entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
          .forEach(authorEntity -> {
@@ -401,7 +401,7 @@ rule "19: Redact AUTHOR(S)"
 
 rule "20: Redact PERFORMING LABORATORY"
     when
-        $section: SectionNode(excludesTables, containsString("PERFORMING LABORATORY:"))
+        $section: Section(excludesTables, containsString("PERFORMING LABORATORY:"))
     then
         entityCreationService.betweenStrings("PERFORMING LABORATORY:", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
          .forEach(authorEntity -> {
@@ -415,7 +415,7 @@ rule "20: Redact PERFORMING LABORATORY"
 
 rule "21: Redact On behalf of Sequani Ltd.:"
     when
-        $section: SectionNode(excludesTables, containsString("On behalf of Sequani Ltd.: Name Title"))
+        $section: Section(excludesTables, containsString("On behalf of Sequani Ltd.: Name Title"))
     then
         entityCreationService.betweenStrings("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", EntityType.ENTITY, $section)
          .forEach(authorEntity -> {
@@ -429,7 +429,7 @@ rule "21: Redact On behalf of Sequani Ltd.:"
 
 rule "22: Redact On behalf of Syngenta Ltd.:"
     when
-        $section: SectionNode(excludesTables, containsString("On behalf of Syngenta Ltd.: Name Title"))
+        $section: Section(excludesTables, containsString("On behalf of Syngenta Ltd.: Name Title"))
     then
         entityCreationService.betweenStrings("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", EntityType.ENTITY, $section)
          .forEach(authorEntity -> {
@@ -443,7 +443,7 @@ rule "22: Redact On behalf of Syngenta Ltd.:"
 
 rule "26: Redact signatures"
     when
-        $signature: ImageNode(imageType == ImageType.SIGNATURE)
+        $signature: Image(imageType == ImageType.SIGNATURE)
     then
         $signature.setRedaction(true);
         $signature.setMatchedRule(26);
@@ -453,7 +453,7 @@ rule "26: Redact signatures"
 
 rule "27: Redact formulas"
     when
-        $formula: ImageNode(imageType == ImageType.FORMULA)
+        $formula: Image(imageType == ImageType.FORMULA)
     then
         $formula.setRedaction(true);
         $formula.setMatchedRule(27);
@@ -463,7 +463,7 @@ rule "27: Redact formulas"
 
 rule "28: Redact logos"
     when
-        $logo: ImageNode(imageType == ImageType.LOGO)
+        $logo: Image(imageType == ImageType.LOGO)
     then
         $logo.setRedaction(true);
         $logo.setMatchedRule(28);
@@ -492,7 +492,7 @@ rule "30: Remove Dossier redactions if file is confidential"
 
 rule "101: Redact CAS Number"
     when
-        $table: TableNode(hasHeader("Sample #"))
+        $table: Table(hasHeader("Sample #"))
     then
         $table.streamTableCellsWithHeader("Sample #")
             .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "PII", EntityType.ENTITY))
@@ -507,7 +507,7 @@ rule "101: Redact CAS Number"
 
 rule "102: Guidelines FileAttributes"
     when
-        $section: SectionNode(excludesTables, (containsString("DATA REQUIREMENT(S):") || containsString("TEST GUIDELINE(S):")) && (containsString("OECD") || containsString("EPA") || containsString("OPPTS")))
+        $section: Section(excludesTables, (containsString("DATA REQUIREMENT(S):") || containsString("TEST GUIDELINE(S):")) && (containsString("OECD") || containsString("EPA") || containsString("OPPTS")))
     then
         RedactionSearchUtility.findBoundariesByRegex("OECD (No\\.? )?\\d{3}( \\(\\d{4}\\))?", $section.buildTextBlock()).stream()
             .map(boundary -> $section.buildTextBlock().subSequence(boundary).toString())
@@ -569,7 +569,7 @@ rule "Apply id removals that are valid and not in forced redactions to Image"
     when
         IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
         not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
-        $entityToBeRemoved: ImageNode($id == id)
+        $entityToBeRemoved: Image($id == id)
     then
         $entityToBeRemoved.setIgnored(true);
     end
@@ -589,7 +589,7 @@ rule "Apply image recategorization"
     salience 128
     when
         ManualImageRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $imageType: type)
-        $image: ImageNode($id == id)
+        $image: Image($id == id)
     then
         $image.setImageType(parseImageType($imageType));
     end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
index 716d28a6..4425bdda 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl
@@ -14,8 +14,8 @@ import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.*;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.*;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
 import java.util.Set
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
@@ -39,7 +39,7 @@ import java.util.Collection;
 import java.util.stream.Stream;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
 
-global DocumentGraph document
+global Document document
 global EntityCreationService entityCreationService
 global ManualRedactionApplicationService manualRedactionApplicationService
 global NerEntitiesAdapter nerEntitiesAdapter
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/testRules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/testRules.drl
deleted file mode 100644
index 8275cfae..00000000
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/testRules.drl
+++ /dev/null
@@ -1,393 +0,0 @@
-package drools
-
-import static java.lang.String.format;
-import static com.iqser.red.service.redaction.v1.server.document.services.CharSequenceSearchUtils.anyMatch;
-import static com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentService.setFields;
-
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.HashSet;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.*
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.*
-import com.iqser.red.service.redaction.v1.server.document.graph.entity.*
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.*
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import java.util.Set
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine
-import com.iqser.red.service.redaction.v1.server.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel
-import com.iqser.red.service.redaction.v1.server.layoutparsing.layout.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.layout.document.graph.entity.RedactionEntity
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
-
-global DocumentGraph document
-global EntityCreationService entityCreationService
-global Dictionary dictionary
-
-
-query "getFileAttributes"
-    $fileAttribute: FileAttribute()
-    end
-
-rule "merge intersecting Entities of same type"
-    salience 100
-
-    when
-        $first: RedactionEntity($type: type, $entityType: entityType, !resized, !skipRemoveEntitiesContainedInLarger)
-        $second: RedactionEntity(intersects($first), type == $type, entityType == $entityType, this != $first, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $first.removeFromGraph();
-        $second.removeFromGraph();
-        RedactionEntity mergedEntity = entityCreationService.byEntities(List.of($first, $second), $type, $entityType, document);
-        insert(mergedEntity);
-        retract($first);
-        retract($second);
-    end
-
-rule "remove Entity of type ENTITY when contained by FALSE_POSITIVE"
-    salience 100
-
-    when
-        $falsePositive: RedactionEntity($type: type, entityType == EntityType.FALSE_POSITIVE)
-        $entity: RedactionEntity(containedBy($falsePositive), type == $type, entityType == EntityType.ENTITY, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $entity.removeFromGraph();
-        retract($entity);
-    end
-
-rule "remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
-    salience 100
-
-    when
-        $falseRecommendation: RedactionEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION)
-        $recommendation: RedactionEntity(containedBy($falseRecommendation), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $recommendation.removeFromGraph();
-        retract($recommendation);
-    end
-
-rule "remove Entity of type RECOMMENDATION when contained by ENTITY"
-    salience 100
-
-    when
-        $entity: RedactionEntity($type: type, entityType == EntityType.ENTITY)
-        $recommendation: RedactionEntity(containedBy($entity), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
-    then
-        $recommendation.removeFromGraph();
-        retract($recommendation);
-    end
-
-rule "remove Entity of lower rank, when equal boundaries and entityType"
-    salience 100
-
-    when
-        $higherRank: RedactionEntity($type: type, $entityType: entityType, $boundary: boundary)
-        $lowerRank: RedactionEntity($boundary == boundary, type != $type, entityType == $entityType, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type))
-    then
-        $lowerRank.removeFromGraph();
-        retract($lowerRank);
-    end
-
-rule "run local dictionary search"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-    salience -999
-
-    when
-        DictionaryModel(!localEntries.isEmpty(), $type: type, $searchImplementation: localSearch) from dictionary.getDictionaryModels()
-    then
-        Set<RedactionEntity> redactionEntities = entityCreationService.bySearchImplementation($searchImplementation, $type, EntityType.RECOMMENDATION, document);
-        System.out.printf("local dictionary search found %d entities\n", redactionEntities.size());
-        redactionEntities.forEach(redactionEntity -> insert(redactionEntity));
-    end
-
-
-// --------------------------------------- CBI rules -------------------------------------------------------------------
-
-rule "1: Redact CBI Authors (Non vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 1, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "2: Redact CBI Authors (Vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "no")
-        $entity: RedactionEntity(type == "CBI_author", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 2, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "3: Don't redact CBI Address (Non vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "no")
-        $entity: RedactionEntity(type == "CBI_address", entityType == EntityType.ENTITY)
-    then
-        setFields($entity, 3, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "4: Redact CBI Address (Vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "CBI_address", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 4, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "5: Add FALSE_POSITIVE Entity for genitive CBI_author"
-
-    when
-        $entity: RedactionEntity(type == "CBI_author", anyMatch(textAfter, "['’’'ʼˈ´`‘′ʻ’']s"), redaction)
-    then
-        RedactionEntity entity = entityCreationService.byBoundary($entity.getBoundary(), "CBI_author", EntityType.FALSE_POSITIVE, document);
-        setFields($entity, 5, "Genitive Author", null, Engine.RULE);
-        insert(entity);
-    end
-
-
-rule "6: Create Entity from Author(s) cells in Tables with Author(s) header and add Authorname as Recommendation"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        authorCell: TableCellNode(!header, (hasHeader("Author(s)") || hasHeader("Author")), hasText())
-    then
-        RedactionEntity entity = entityCreationService.bySemanticNode(authorCell, "CBI_author", EntityType.ENTITY);
-        setFields(entity, 6, "Header Author(s) found", null, Engine.RULE);
-        insert(entity);
-        dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), true);
-    end
-
-rule "7: Add CBI_author with \"et al.\" Regex"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-         $section: SectionNode(containsString("et al."))
-    then
-         Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, $section);
-         setFields(entities, 7, "Found by \"et al.\" regex", null, Engine.RULE);
-         entities.forEach(entity -> insert(entity));
-         entities.forEach(entity -> dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), false));
-    end
-
-rule "8: Add recommendation for Addresses in Test Organism sections"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString("Source",  "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 8, "Line after \"Source\" in Test Organism Section", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-
-rule "9: Add recommendation for Addresses in Test Animals sections"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("Species:") && containsString("Source:"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString("Source:", "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 9, "Line after \"Source:\" in Test Organism Section", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "12: Recommend CTL/BL laboratory that start with BL or CTL"
-
-    when
-        $section : SectionNode(containsString("BL") || containsString("CT"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("((\\b((([Cc]T(([1ILli\\/])| L|~P))|(BL))[\\. ]?([\\dA-Ziltphz~\\/.:!]| ?[\\(',][Ppi](\\(e)?|([\\(-?']\\/))+( ?[\\(\\/\\dA-Znasieg]+)?)\\b( ?\\/? ?\\d+)?)|(\\bCT[L1i]\\b))", "CBI_address", EntityType.RECOMMENDATION, $section);
-        setFields(entities, 12, "Syngenta Specific Laboratory keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-
-// --------------------------------------- PII rules -------------------------------------------------------------------
-
-
-rule "10: Redacted PII Personal Identification Information (Non vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $entity: RedactionEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 10, "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-
-
-rule "11: Redacted PII Personal Identification Information (Vertebrate study)"
-    no-loop true
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $entity: RedactionEntity(type == "PII", entityType == EntityType.ENTITY)
-    then
-        $entity.setRedaction(true);
-        setFields($entity, 11, "Personal Information found", "Article 39(e)(2) of Regulation (EC) No 178/2002", null);
-        update($entity)
-    end
-
-rule "12: Redact Emails by RegEx (Non vertebrate study)"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $section: SectionNode(containsString("@"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 12, "Found by email regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-rule "13: Redact Emails by RegEx (Vertebrate study)"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode(containsString("@"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 13, "Found by email regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
-
-
-rule "14: Redact line after contact information (Non vertebrate study)"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $string: String() from List.of("Contact point:",
-                                         "Contact:",
-                                         "Alternative contact:",
-                                         "European contact:",
-                                         "No:",
-                                         "Contact:",
-                                         "Tel.:",
-                                         "Tel:",
-                                         "Telephone number:",
-                                         "Telephone No:",
-                                         "Telephone:",
-                                         "Phone No:",
-                                         "Phone:",
-                                         "Fax number:",
-                                         "Fax:",
-                                         "E-mail:",
-                                         "Email:",
-                                         "e-mail:",
-                                         "E-mail address:")
-        $section: SectionNode(containsString($string))
-    then
-
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.lineAfterString($string, "PII", EntityType.ENTITY, $section));
-        setFields(entities, 14, "Found by contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-
-rule "15: Redact line after contact information (Vertebrate study)"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $string: String() from List.of("Contact point:",
-                                         "Contact:",
-                                         "Alternative contact:",
-                                         "European contact:",
-                                         "No:",
-                                         "Contact:",
-                                         "Tel.:",
-                                         "Tel:",
-                                         "Telephone number:",
-                                         "Telephone No:",
-                                         "Telephone:",
-                                         "Phone No:",
-                                         "Phone:",
-                                         "Fax number:",
-                                         "Fax:",
-                                         "E-mail:",
-                                         "Email:",
-                                         "e-mail:",
-                                         "E-mail address:")
-        $section: SectionNode(containsString($string))
-    then
-        Set<RedactionEntity> entities = entityCreationService.lineAfterString($string, "PII", EntityType.ENTITY, $section);
-        setFields(entities, 15, "Found by contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-
-rule "16: redact line between contact keywords"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() != "yes")
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
-    then
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section));
-        entities.addAll(entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section));
-        setFields(entities, 16, "Found between contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "17: redact line between contact keywords"
-    agenda-group "LOCAL_DICTIONARY_ADDS"
-
-    when
-        FileAttribute(label == "Vertebrate Study" , value.toLowerCase() == "yes")
-        $section: SectionNode((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
-    then
-        Set<RedactionEntity> entities = new HashSet<>();
-        entities.addAll(entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section));
-        entities.addAll(entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section));
-        setFields(entities, 17, "Found between contacts keyword", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-        entities.forEach(entity -> dictionary.addLocalDictionaryEntry("PII", entity.getValue(), false));
-    end
-
-rule "18: Redact Phone and Fax by RegEx"
-
-    when
-        $section: SectionNode(containsString("Contact") ||
-            containsString("Telephone") ||
-            containsString("Phone") ||
-            containsString("Fax") ||
-            containsString("Tel") ||
-            containsString("Ter") ||
-            containsString("Mobile") ||
-            containsString("Fel") ||
-            containsString("Fer"))
-    then
-        Set<RedactionEntity> entities = entityCreationService.byRegex("\\b(contact|telephone|phone|fax|tel|ter|mobile|fel|fer)[a-zA-Z\\s]{0,10}[:.\\s]{0,3}([\\+\\d\\(][\\s\\d\\(\\)\\-\\/\\.]{4,100}\\d)\\b", "PII", EntityType.ENTITY, $section);
-        setFields(entities, 18, "Found by Phone and Fax regex", null, Engine.RULE);
-        entities.forEach(entity -> insert(entity));
-    end
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl
index 03c18c70..db4042a3 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl
@@ -1,480 +1,698 @@
 package drools
 
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section
+import static java.lang.String.format;
+import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility.anyMatch;
+import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility.exactMatch;
+import static com.iqser.red.service.redaction.v1.server.layoutparsing.document.data.mapper.PropertiesMapper.parseImageType;
 
-global Section section
+import java.util.List;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Liszt;
+import java.util.LinkedList;
+import java.util.HashSet;
 
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.*;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.*;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.*;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.*;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
+import java.util.Set
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryModel;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualImageRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.ManualRedactionApplicationService;
+import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionEntity;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntitiesAdapter;
+import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
+import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.stream.Stream;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.utils.RedactionSearchUtility;
+
+global Document document
+global EntityCreationService entityCreationService
+global ManualRedactionApplicationService manualRedactionApplicationService
+global NerEntitiesAdapter nerEntitiesAdapter
+global Dictionary dictionary
+
+// --------------------------------------- queries -------------------------------------------------------------------
+
+query "getFileAttributes"
+    $fileAttribute: FileAttribute()
+    end
 
 // --------------------------------------- CBI rules -------------------------------------------------------------------
-rule "0: Add CBI_author from ai"
+
+rule "0: Expand CBI_author entities with firstname initials"
+    no-loop true
     when
-        Section(aiMatchesType("CBI_author"))
+        $entityToExpand: RedactionEntity(type == "CBI_author",
+          value.matches("[^\\s]+"),
+          textAfter.startsWith(" "),
+          anyMatch(textAfter, "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)")
+          )
     then
-        section.addAiEntities("CBI_author", "CBI_author",dictionary);
+        RedactionEntity expandedEntity = entityCreationService.bySuffixExpansionRegex($entityToExpand, "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)");
+        expandedEntity.addMatchedRule(0);
+        $entityToExpand.removeFromGraph();
+        retract($entityToExpand);
+        insert(expandedEntity);
     end
 
-
-rule "0: Combine ai types CBI_author from ai"
+rule "0: Expand CBI_author and PII entities with salutation prefix"
     when
-        Section(aiMatchesType("ORG"))
+        $entityToExpand: RedactionEntity((type == "CBI_author" || type == "PII"), anyMatch(textBefore, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*"))
     then
-        section.combineAiTypes("ORG", "STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "CBI_address", 3, false, dictionary);
+        RedactionEntity expandedEntity = entityCreationService.byPrefixExpansionRegex($entityToExpand, "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*");
+        expandedEntity.addMatchedRule(0);
+        insert(expandedEntity);
     end
 
-
-rule "1: Redact CBI Authors (Non vertebrate study)"
+rule "1: Redacted because Section contains Vertebrate"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_author"))
+        $section: Section(hasEntitiesOfType("vertebrate"),
+                             (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        section.redact("CBI_author", 1, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+       $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(true);
+                redactionEntity.addMatchedRule(1);
+                redactionEntity.setRedactionReason("Vertebrate Found in this section");
+                redactionEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+            });
     end
 
-
-rule "2: Redact CBI Authors (Vertebrate study)"
+rule "2: Not Redacted because Section contains no Vertebrate"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_author"))
+        $section: Section(!hasEntitiesOfType("vertebrate"),
+                             (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        section.redact("CBI_author", 2, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+       $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+        .forEach(redactionEntity -> {
+            redactionEntity.setRedaction(false);
+            redactionEntity.addMatchedRule(2);
+            redactionEntity.setRedactionReason("No Vertebrate Found in this section");
+        });
     end
 
-
-rule "3: Redact not CBI Address (Non vertebrate study)"
+rule "3: Do not redact Names and Addresses if no redaction Indicator is contained"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_address"))
+        $section: Section(hasEntitiesOfType("vertebrate"),
+                              hasEntitiesOfType("no_redaction_indicator"),
+                             (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        section.redactNot("CBI_address", 3, "Address found for non vertebrate study");
-        section.ignoreRecommendations("CBI_address");
+        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(false);
+                redactionEntity.addMatchedRule(3);
+                redactionEntity.setRedactionReason("Vertebrate and a no-redaction-indicator found in this section");
+            });
     end
 
-
-rule "4: Redact CBI Address (Vertebrate study)"
+rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("CBI_address"))
+        $section: Section(hasEntitiesOfType("vertebrate"),
+                              hasEntitiesOfType("no_redaction_indicator"),
+                              hasEntitiesOfType("redaction_indicator"),
+                             (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        section.redact("CBI_address", 4, "Address found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(true);
+                redactionEntity.addMatchedRule(4);
+                redactionEntity.setRedactionReason("Vertebrate and a no-redaction-indicator, but also redaction-indicator, found in this section");
+                redactionEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+            });
     end
 
+rule "5: Do not redact Names and Addresses if published information found"
 
-rule "5: Do not redact genitive CBI_author"
     when
-        Section(matchesType("CBI_author"))
+        $section: Section(hasEntitiesOfType("vertebrate"),
+                              hasEntitiesOfType("published_information"),
+                             (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        section.expandToFalsePositiveByRegEx("CBI_author", "['’’'ʼˈ´`‘′ʻ’']s", false, 0, dictionary);
+        List<RedactionEntity>  publishedInformationEntities = $section.getEntitiesOfType("published_information");
+        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(false);
+                redactionEntity.setRedactionReason("Vertebrate but also Published Information found in this section");
+                redactionEntity.addReferences(publishedInformationEntities);
+            });
     end
 
-
-rule "6: Redact Author(s) cells in Tables with Author(s) header (Non vertebrate study)"
+rule "6.0: Add all Cell's with Header Author(s) as CBI_author"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author(s)") && !hasTableHeader("Vertebrate study Y/N"))
+        $table: Table(hasHeader("Author(s)"))
     then
-        section.redactCell("Author(s)", 6, "CBI_author", false, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        $table.streamTableCellsWithHeader("Author(s)")
+            .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "CBI_author", EntityType.ENTITY))
+            .forEach(redactionEntity -> {
+                redactionEntity.addMatchedRule(6);
+                redactionEntity.setRedactionReason("Author(s) header found");
+                insert(redactionEntity);
+            });
     end
 
-
-rule "7: Redact Author(s) cells in Tables with Author(s) header (Vertebrate study)"
+rule "6.1: Dont redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value No"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author(s)") && !hasTableHeader("Vertebrate study Y/N"))
+        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "N") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "No"))
     then
-        section.redactCell("Author(s)", 7, "CBI_author", false, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("N", "No"))
+            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
+            .forEach(authorEntity -> {
+                authorEntity.setRedaction(false);
+                authorEntity.setRedactionReason("Not redacted because it's row does not belong to a vertebrate study");
+                authorEntity.setLegalBasis("");
+                authorEntity.addMatchedRule(6);
+            });
     end
 
-
-rule "8: Redact Author cells in Tables with Author header (Non vertebrate study)"
+rule "7: Redact CBI_author, if its row contains a cell with header \"Vertebrate study Y/N\" and value Yes"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author") && !hasTableHeader("Vertebrate study Y/N"))
+        $table: Table(hasRowWithHeaderAndValue("Vertebrate study Y/N", "Y") || hasRowWithHeaderAndValue("Vertebrate study Y/N", "Yes"))
     then
-        section.redactCell("Author", 8, "CBI_author", false, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        $table.streamEntitiesWhereRowHasHeaderAndAnyValue("Vertebrate study Y/N", List.of("Y", "Yes"))
+            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
+            .forEach(authorEntity -> {
+                authorEntity.setRedaction(true);
+                authorEntity.setRedactionReason("Redacted because it's row belongs to a vertebrate study");
+                authorEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+                authorEntity.addMatchedRule(7);
+            });
     end
 
-
-rule "9: Redact Author cells in Tables with Author header (Vertebrate study)"
+rule "8: Redact if must_redact entity is found"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && hasTableHeader("Author") && !hasTableHeader("Vertebrate study Y/N"))
+        $section: Section(hasEntitiesOfType("must_redact"),
+                             (hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address")))
     then
-        section.redactCell("Author", 9, "CBI_author", false, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+       $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(true);
+                redactionEntity.setRedactionReason("must_redact entry was found.");
+                redactionEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+                redactionEntity.addMatchedRule(8);
+            });
     end
 
-
-rule "10: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Non vertebrate study)"
+rule "9: Redact CBI_sponsor entities if preceded by \" batches produced at\""
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes") || rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No")))
+        $sponsorEntity: RedactionEntity(type == "CBI_sponsor", textBefore.contains("batches produced at"))
     then
-        section.redactCell("Author(s)", 10, "CBI_author", true, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        $sponsorEntity.setRedaction(true);
+        $sponsorEntity.setRedactionReason("Redacted because it represents a sponsor company");
+        $sponsorEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+        $sponsorEntity.addMatchedRule(9);
     end
 
-
-rule "11: Redact and recommand Authors in Tables with Vertebrate study Y/N header (Vertebrate study)"
+rule "10: Redact row if row contains \"determination of residues\" and livestock keyword"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes") || rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No")))
+        $keyword: String() from List.of("livestock",
+                                        "live stock",
+                                        "tissue",
+                                        "tissues",
+                                        "liver",
+                                        "muscle",
+                                        "bovine",
+                                        "ruminant",
+                                        "ruminants")
+        $residueKeyword: String() from List.of("determination of residues", "determination of total residues")
+        $table: Table(containsStringIgnoreCase($residueKeyword)
+                            && containsStringIgnoreCase($keyword))
     then
-        section.redactCell("Author(s)", 11, "CBI_author", true, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        entityCreationService.byString($keyword, "must_redact", EntityType.ENTITY, $table)
+            .forEach(keywordEntity -> insert(keywordEntity));
+
+        $table.streamEntitiesWhereRowContainsStringsIgnoreCase(List.of($keyword, $residueKeyword))
+            .filter(redactionEntity -> redactionEntity.isAnyType(List.of("CBI_author", "CBI_address")))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(true);
+                redactionEntity.setRedactionReason("Determination of residues and keyword \"" + $keyword + "\" was found.");
+                redactionEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+                redactionEntity.addMatchedRule(10);
+            });
     end
 
-
-rule "13: Redact addresses that start with BL or CTL"
+rule "11: Redact if CTL/* or BL/*  was found"
     when
-        Section(searchText.contains("BL") || searchText.contains("CT"))
+        $section: Section(excludesTables, (containsString("CTL/") || containsString("BL/")))
     then
-        section.redactNotAndRecommendByRegEx("((\\b((([Cc]T(([1ILli\\/])| L|~P))|(BL))[\\. ]?([\\dA-Ziltphz~\\/.:!]| ?[\\(',][Ppi](\\(e)?|([\\(-?']\\/))+( ?[\\(\\/\\dA-Znasieg]+)?)\\b( ?\\/? ?\\d+)?)|(\\bCT[L1i]\\b))", true, 0, "CBI_address", 13, "Laboratory for vertebrate studies found",dictionary);
+        entityCreationService.byString("CTL/", "must_redact", EntityType.ENTITY, $section)
+            .forEach(mustRedactEntity -> insert(mustRedactEntity));
+        entityCreationService.byString("BL/", "must_redact", EntityType.ENTITY, $section)
+            .forEach(mustRedactEntity -> insert(mustRedactEntity));
+
+        $section.getEntitiesOfType(List.of("CBI_author", "CBI_address"))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(true);
+                redactionEntity.setRedactionReason("Laboratory for vertebrate studies found");
+                redactionEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+                redactionEntity.addMatchedRule(11);
+            });
     end
 
-
-rule "14: Redact and add recommendation for et al. author (Non vertebrate study)"
+rule "12: Add CBI_author with \"et al.\" Regex"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("et al"))
+         $section: Section(containsString("et al."))
     then
-        section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 14, "Author found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+         entityCreationService.byRegex("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", "CBI_author", EntityType.ENTITY, $section)
+            .forEach(entity -> {
+                entity.setRedaction(true);
+                entity.setRedactionReason("Author found by \"et al\" regex");
+                entity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+                entity.addMatchedRule(12);
+                insert(entity);
+                dictionary.addLocalDictionaryEntry("CBI_author", entity.getValue(), false);
+            });
     end
 
-
-rule "15: Redact and add recommendation for et al. author (Vertebrate study)"
+rule "13: Add recommendation for Addresses in Test Organism sections"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("et al"))
+        $section: Section(excludesTables, containsString("Species") && containsString("Source") && !containsString("Species:") && !containsString("Source:"))
     then
-        section.redactAndRecommendByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]{1,2}\\.?)?( ?[A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author", 15, "Author found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        entityCreationService.lineAfterString("Source",  "CBI_address", EntityType.RECOMMENDATION, $section)
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedactionReason("Line after \"Source\" in Test Organism Section");
+                redactionEntity.addMatchedRule(13);
+                insert(redactionEntity);
+            });
     end
 
+rule "14: Add recommendation for Addresses in Test Animals sections"
 
-rule "16: Add recommendation for Addresses in Test Organism sections"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("Species:") && searchText.contains("Source:"))
+        $section: Section(excludesTables, containsString("Species:"), containsString("Source:"))
     then
-        section.recommendLineAfter("Source:", "CBI_address");
+        entityCreationService.lineAfterString("Source:",  "CBI_address", EntityType.RECOMMENDATION, $section)
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedactionReason("Line after \"Source:\" in Test Animals Section");
+                redactionEntity.addMatchedRule(14);
+                insert(redactionEntity);
+            });
     end
 
-
-rule "17: Add recommendation for Addresses in Test Animals sections"
-    when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("Species") && searchText.contains("Source"))
-    then
-        section.recommendLineAfter("Source", "CBI_address");
-    end
-
-
-rule "18: Do not redact Names and Addresses if Published Information found"
-    when
-        Section(matchesType("published_information"))
-    then
-        section.redactNotAndReference("CBI_author","published_information", 18, "Published Information found");
-        section.redactNotAndReference("CBI_address","published_information", 18, "Published Information found");
-    end
-
-
 // --------------------------------------- PII rules -------------------------------------------------------------------
 
-
-rule "19: Redacted PII Personal Identification Information (Non vertebrate study)"
+rule "15: Redact all PII"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("PII"))
+        $pii: RedactionEntity(type == "PII", redaction == false)
     then
-        section.redact("PII", 19, "PII (Personal Identification Information) found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $pii.setRedaction(true);
+        $pii.setRedactionReason("PII found");
+        $pii.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+        $pii.addMatchedRule(15);
+    end
+
+rule "16: Redact Emails by RegEx (Non vertebrate study)"
+    when
+        $section: Section(containsString("@"))
+    then
+        entityCreationService.byRegex("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", "PII", EntityType.ENTITY, $section)
+            .forEach(emailEntity -> {
+                emailEntity.setRedaction(true);
+                emailEntity.setRedactionReason("Found by Email Regex");
+                emailEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+                emailEntity.addMatchedRule(16);
+                insert(emailEntity);
+            });
+    end
+
+rule "17: Redact line after contact information keywords"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
+    when
+        $contactKeyword: String() from List.of("Contact point:",
+                                         "Contact:",
+                                         "Alternative contact:",
+                                         "European contact:",
+                                         "No:",
+                                         "Contact:",
+                                         "Tel.:",
+                                         "Tel:",
+                                         "Telephone number:",
+                                         "Telephone No:",
+                                         "Telephone:",
+                                         "Phone No.",
+                                         "Phone:",
+                                         "Fax number:",
+                                         "Fax:",
+                                         "E-mail:",
+                                         "Email:",
+                                         "e-mail:",
+                                         "E-mail address:")
+        $section: Section(containsString($contactKeyword))
+    then
+        entityCreationService.lineAfterString($contactKeyword, "PII", EntityType.ENTITY, $section)
+            .forEach(contactEntity -> {
+                contactEntity.setRedaction(true);
+                contactEntity.addMatchedRule(17);
+                contactEntity.setRedactionReason("Found after \"" + $contactKeyword + "\" contact keyword");
+                contactEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+                insert(contactEntity);
+                dictionary.addLocalDictionaryEntry("PII", contactEntity.getValue(), false);
+            });
     end
 
 
-rule "20: Redacted PII Personal Identification Information (Vertebrate study)"
+rule "18: redact line between contact keywords"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesType("PII"))
+        $section: Section((containsString("No:") && containsString("Fax")) || (containsString("Contact:") && containsString("Tel")))
     then
-        section.redact("PII", 20, "PII (Personal Identification Information) found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        Stream.concat(
+            entityCreationService.betweenStrings("No:", "Fax", "PII", EntityType.ENTITY, $section),
+            entityCreationService.betweenStrings("Contact:", "Tel", "PII", EntityType.ENTITY, $section)
+        )
+            .forEach(contactEntity -> {
+                contactEntity.setRedaction(true);
+                contactEntity.addMatchedRule(18);
+                contactEntity.setRedactionReason("Found between contact keywords");
+                contactEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+                insert(contactEntity);
+                dictionary.addLocalDictionaryEntry("PII", contactEntity.getValue(), false);
+            });
     end
 
-
-rule "21: Redact Emails by RegEx (Non vertebrate study)"
+rule "19: Redact AUTHOR(S)"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("@"))
+        FileAttribute(placeholder == "{fileattributes.vertebrateStudy}", value == "true")
+        $section: Section(excludesTables, containsString("AUTHOR(S):"), containsString("COMPLETION DATE:"))
     then
-        section.redactByRegEx("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", true, 1, "PII", 21, "PII (Personal Identification Information) found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        entityCreationService.betweenStrings("AUTHOR(S):", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
+         .forEach(authorEntity -> {
+             authorEntity.setRedaction(true);
+             authorEntity.addMatchedRule(19);
+             authorEntity.setRedactionReason("AUTHOR(S) was found");
+             authorEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+             insert(authorEntity);
+         });
     end
 
-
-rule "22: Redact Emails by RegEx (Vertebrate study)"
+rule "20: Redact PERFORMING LABORATORY"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("@"))
+        $section: Section(excludesTables, containsString("PERFORMING LABORATORY:"))
     then
-        section.redactByRegEx("\\b([A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\-]{1,23}[A-Za-z])\\b", true, 1, "PII", 22, "PII (Personal Identification Information) found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        entityCreationService.betweenStrings("PERFORMING LABORATORY:", "COMPLETION DATE:", "PII", EntityType.ENTITY, $section)
+         .forEach(authorEntity -> {
+             authorEntity.setRedaction(true);
+             authorEntity.addMatchedRule(20);
+             authorEntity.setRedactionReason("PERFORMING LABORATORY was found");
+             authorEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+             insert(authorEntity);
+         });
     end
 
-
-rule "23: Redact telephone numbers by RegEx (Non vertebrate study)"
+rule "21: Redact On behalf of Sequani Ltd.:"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && containsRegEx("[+]\\d{2,}", true))
+        $section: Section(excludesTables, containsString("On behalf of Sequani Ltd.: Name Title"))
     then
-        section.redactByRegEx("((([+]\\d{2,3} (\\d{7,12})\\b)|([+]\\d{2,3}(\\d{3,12})\\b|[+]\\d{2,3}([ -]\\(?\\d{2,6}\\)?){2,4})|[+]\\d{2,3} ?((\\d{2,6}\\)?)([ -]\\d{2,6}){1,4}))(-\\d{1,3})?\\b)", true, 1, "PII", 23, "PII (Personal Identification Information) found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        entityCreationService.betweenStrings("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", EntityType.ENTITY, $section)
+         .forEach(authorEntity -> {
+             authorEntity.setRedaction(true);
+             authorEntity.addMatchedRule(21);
+             authorEntity.setRedactionReason("On behalf of Sequani Ltd.: Name Title was found");
+             authorEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+             insert(authorEntity);
+         });
     end
 
-
-rule "24: Redact telephone numbers by RegEx (Vertebrate study)"
+rule "22: Redact On behalf of Syngenta Ltd.:"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && containsRegEx("[+]\\d{2,}", true))
+        $section: Section(excludesTables, containsString("On behalf of Syngenta Ltd.: Name Title"))
     then
-        section.redactByRegEx("((([+]\\d{2,3} (\\d{7,12})\\b)|([+]\\d{2,3}(\\d{3,12})\\b|[+]\\d{2,3}([ -]\\(?\\d{2,6}\\)?){2,4})|[+]\\d{2,3} ?((\\d{2,6}\\)?)([ -]\\d{2,6}){1,4}))(-\\d{1,3})?\\b)", true, 1, "PII", 24, "PII (Personal Identification Information) found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        entityCreationService.betweenStrings("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", EntityType.ENTITY, $section)
+         .forEach(authorEntity -> {
+             authorEntity.setRedaction(true);
+             authorEntity.addMatchedRule(21);
+             authorEntity.setRedactionReason("On behalf of Syngenta Ltd.: Name Title was found");
+             authorEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2e)");
+             insert(authorEntity);
+         });
     end
 
-
-rule "25: Recommend telephone numbers by RegEx"
+rule "26: Redact signatures"
     when
-        Section(containsRegEx("\\d{3,}", true) || containsRegEx("[+]\\d{2,}", true))
+        $signature: Image(imageType == ImageType.SIGNATURE)
     then
-        section.addRecommendationByRegEx("([+]\\d{2,3} (\\d{7,12})\\b|((([+]\\d{2,3}(\\d{3,12})\\b|[+]\\d{2,3}([ -]\\(?\\d{2,6}\\)?){2,4})|(\\(?\\b(\\d{2,6}\\)?)([ -]\\d{2,6}){1,4}))(-\\d{1,3})?\\b))", true, 1, "PII");
+        $signature.setRedaction(true);
+        $signature.setMatchedRule(26);
+        $signature.setRedactionReason("Signature Found");
+        $signature.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
     end
 
-
-rule "26: Redact contact information (Non vertebrate study)"
+rule "27: Redact formulas"
     when
-       Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (text.contains("Contact point:")
-       || text.contains("Phone:")
-       || text.contains("Fax:")
-       || text.contains("Tel.:")
-       || text.contains("Tel:")
-       || text.contains("E-mail:")
-       || text.contains("Email:")
-       || text.contains("e-mail:")
-       || text.contains("E-mail address:")
-       || text.contains("Alternative contact:")
-       || text.contains("Telephone number:")
-       || text.contains("Telephone No:")
-       || text.contains("Fax number:")
-       || text.contains("Telephone:")
-       || text.contains("Phone No.")
-       || text.contains("European contact:")))
+        $formula: Image(imageType == ImageType.FORMULA)
     then
-          section.redactLineAfter("Contact point:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Phone:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Fax:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Tel.:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Tel:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("E-mail:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Email:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("e-mail:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("E-mail address:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Contact:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Alternative contact:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone number:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone No:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Fax number:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Phone No.", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactBetween("No:", "Fax", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactBetween("Contact:", "Tel.:", "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("European contact:",  "PII", 26, true, "Contact information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        $formula.setRedaction(true);
+        $formula.setMatchedRule(27);
+        $formula.setRedactionReason("Formula Found");
+        $formula.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+    end
+
+rule "28: Redact logos"
+    when
+        $logo: Image(imageType == ImageType.LOGO)
+    then
+        $logo.setRedaction(true);
+        $logo.setMatchedRule(28);
+        $logo.setRedactionReason("Logo Found");
+        $logo.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+    end
+
+rule "29: Redact Dossier Redactions"
+     when
+         $dossierRedaction: RedactionEntity(type == "dossier_redactions")
+     then
+        $dossierRedaction.setRedaction(true);
+        $dossierRedaction.addMatchedRule(29);
+        $dossierRedaction.setRedactionReason("Dossier Redaction found");
+        $dossierRedaction.setLegalBasis("Article 39(1)(2) of Regulation (EC) No 178/2002");
      end
 
-
-rule "27: Redact contact information (Vertebrate study)"
-    when
-       Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (text.contains("Contact point:")
-       || text.contains("Phone:")
-       || text.contains("Fax:")
-       || text.contains("Tel.:")
-       || text.contains("Tel:")
-       || text.contains("E-mail:")
-       || text.contains("Email:")
-       || text.contains("e-mail:")
-       || text.contains("E-mail address:")
-       || text.contains("Alternative contact:")
-       || text.contains("Telephone number:")
-       || text.contains("Telephone No:")
-       || text.contains("Fax number:")
-       || text.contains("Telephone:")
-       || text.contains("Phone No.")
-       || text.contains("European contact:")))
-    then
-          section.redactLineAfter("Contact point:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Phone:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Fax:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Tel.:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Tel:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("E-mail:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Email:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("e-mail:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("E-mail address:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Contact:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Alternative contact:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone number:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone No:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Fax number:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Telephone:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("Phone No.", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactBetween("No:", "Fax", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactBetween("Contact:", "Tel.:", "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-              section.redactLineAfter("European contact:",  "PII", 27, true, "Contact information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+rule "30: Remove Dossier redactions if file is confidential"
+     when
+        FileAttribute(label == "Confidentiality", value == "confidential")
+        $dossierRedaction: RedactionEntity(type == "dossier_redactions")
+     then
+        $dossierRedaction.removeFromGraph();
+        retract($dossierRedaction)
      end
 
-
-rule "28: Redact contact information if applicant is found (Non vertebrate study)"
+rule "101: Redact CAS Number"
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Telephone number:")))
+        $table: Table(hasHeader("Sample #"))
     then
-        section.redactLineAfter("Contact point:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel.:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Email:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("e-mail:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail address:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Alternative contact:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone number:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone No:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax number:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone No.", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("Contact:", "Tel.:", "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("European contact:",  "PII", 28, true, "Applicant information was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        $table.streamTableCellsWithHeader("Sample #")
+            .map(tableCell -> entityCreationService.bySemanticNode(tableCell, "PII", EntityType.ENTITY))
+            .forEach(redactionEntity -> {
+                redactionEntity.setRedaction(true);
+                redactionEntity.addMatchedRule(101);
+                redactionEntity.setRedactionReason("Sample # found in Header");
+                redactionEntity.setLegalBasis("Reg (EC) No 1107/2009 Art. 63 (2g)");
+                insert(redactionEntity);
+            });
     end
 
-
-rule "29: Redact contact information if applicant is found (Vertebrate study)"
+rule "102: Guidelines FileAttributes"
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Telephone number:")))
+        $section: Section(excludesTables, (containsString("DATA REQUIREMENT(S):") || containsString("TEST GUIDELINE(S):")) && (containsString("OECD") || containsString("EPA") || containsString("OPPTS")))
     then
-        section.redactLineAfter("Contact point:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel.:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Email:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("e-mail:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail address:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Alternative contact:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone number:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone No:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax number:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone No.", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("Contact:", "Tel.:", "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("European contact:",  "PII", 29, true, "Applicant information was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        RedactionSearchUtility.findBoundariesByRegex("OECD (No\\.? )?\\d{3}( \\(\\d{4}\\))?", $section.buildTextBlock()).stream()
+            .map(boundary -> $section.buildTextBlock().subSequence(boundary).toString())
+            .map(value -> FileAttribute.builder().label("OECD Number").value(value).build())
+            .forEach(fileAttribute -> insert(fileAttribute));
     end
 
+// --------------------------------------- NER Entities rules -------------------------------------------------------------------
 
-rule "30: Redact contact information if Producer is found (Non vertebrate study)"
+rule "add NER Entities of type CBI_author"
+    salience 999
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance")))
+        nerEntities: NerEntities(hasEntitiesOfType("CBI_author"))
     then
-        section.redactLineAfter("Contact:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax number:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone number:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel:", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone No.", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 30, true, "Producer was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        nerEntities.streamEntitiesOfType("CBI_author")
+            .map(nerEntity -> entityCreationService.byNerEntity(nerEntity, EntityType.RECOMMENDATION, document))
+            .forEach(entity -> insert(entity));
     end
 
-
-rule "31: Redact contact information if Producer is found (Vertebrate study)"
+rule "combine and add NER Entities as CBI_address"
+    salience 999
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && (text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance")))
+        nerEntities: NerEntities(hasEntitiesOfType("ORG") || hasEntitiesOfType("STREET") || hasEntitiesOfType("CITY"))
     then
-        section.redactLineAfter("Contact:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("E-mail:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Contact:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Fax number:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Telephone number:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Tel:", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactLineAfter("Phone No.", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
-        section.redactBetween("No:", "Fax", "PII", 31, true, "Producer was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        nerEntitiesAdapter.combineNerEntitiesToCbiAddressDefaults(nerEntities)
+            .map(boundary -> entityCreationService.byBoundary(boundary, "CBI_address", EntityType.RECOMMENDATION, document))
+            .forEach(entity -> {
+                entity.addEngine(Engine.NER);
+                insert(entity);
+            });
     end
 
+// --------------------------------------- manual redaction rules -------------------------------------------------------------------
 
-rule "32: Redact AUTHOR(S) (Non vertebrate study)"
+rule "Apply manual resize redaction"
+    salience 128
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("AUTHOR(S):") && searchText.contains("COMPLETION DATE:") && !searchText.contains("STUDY COMPLETION DATE:"))
+        $resizeRedaction: ManualResizeRedaction($id: annotationId)
+        $entityToBeResized: RedactionEntity(matchesAnnotationId($id))
     then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 32, true, "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        manualRedactionApplicationService.resizeEntityAndReinsert($entityToBeResized, $resizeRedaction);
+        retract($resizeRedaction);
+        update($entityToBeResized);
     end
 
-
-rule "33: Redact AUTHOR(S) (Vertebrate study)"
+rule "Apply id removals that are valid and not in forced redactions to Entity"
+    salience 128
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("AUTHOR(S):") && searchText.contains("COMPLETION DATE:") && !searchText.contains("STUDY COMPLETION DATE:"))
+        IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
+        not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
+        $entityToBeRemoved: RedactionEntity(matchesAnnotationId($id))
     then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 33, true, "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        $entityToBeRemoved.removeFromGraph();
+        retract($entityToBeRemoved);
     end
 
-
-rule "34: Redact AUTHOR(S) (Non vertebrate study)"
+rule "Apply id removals that are valid and not in forced redactions to Image"
+    salience 128
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("AUTHOR(S):") && searchText.contains("STUDY COMPLETION DATE:"))
+        IdRemoval(status == AnnotationStatus.APPROVED, !removeFromDictionary, requestDate != null, $id: annotationId)
+        not ManualForceRedaction($id == annotationId, status == AnnotationStatus.APPROVED, requestDate != null)
+        $entityToBeRemoved: Image($id == id)
     then
-        section.redactLinesBetween("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", 34, true, "AUTHOR(S) was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
+        $entityToBeRemoved.setIgnored(true);
     end
 
-
-rule "35: Redact AUTHOR(S) (Vertebrate study)"
+rule "Apply force redaction"
+    salience 128
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("AUTHOR(S):") && searchText.contains("STUDY COMPLETION DATE:"))
+        ManualForceRedaction($id: annotationId, status == AnnotationStatus.APPROVED, requestDate != null, $legalBasis: legalBasis)
+        $entityToForce: RedactionEntity(matchesAnnotationId($id))
     then
-        section.redactLinesBetween("AUTHOR(S):", "STUDY COMPLETION DATE:", "PII", 35, true, "AUTHOR(S) was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        $entityToForce.setLegalBasis($legalBasis);
+        $entityToForce.setRedaction(true);
+        $entityToForce.setSkipRemoveEntitiesContainedInLarger(true);
     end
 
-
-rule "36: Redact PERFORMING LABORATORY (Non vertebrate study)"
+rule "Apply image recategorization"
+    salience 128
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("PERFORMING LABORATORY:"))
+        ManualImageRecategorization($id: annotationId, status == AnnotationStatus.APPROVED, $imageType: type)
+        $image: Image($id == id)
     then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", 36, true, "PERFORMING LABORATORY was found", "Article 39(e)(3) of Regulation (EC) No 178/2002",dictionary);
-        section.redactNot("CBI_address", 36, "Performing laboratory found for non vertebrate study");
+        $image.setImageType(parseImageType($imageType));
     end
 
+// --------------------------------------- merging rules -------------------------------------------------------------------
 
-rule "37: Redact PERFORMING LABORATORY (Vertebrate study)"
+rule "remove Entity contained by Entity of same type"
+    salience 65
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && searchText.contains("PERFORMING LABORATORY:"))
+        $larger: RedactionEntity($type: type, $entityType: entityType)
+        $contained: RedactionEntity(containedBy($larger), type == $type, entityType == $entityType, this != $larger, !resized, !skipRemoveEntitiesContainedInLarger)
     then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "CBI_address", 37, true, "PERFORMING LABORATORY was found", "Article 39(e)(2) of Regulation (EC) No 178/2002",dictionary);
+        $contained.removeFromGraph();
+        retract($contained);
     end
 
-
-// --------------------------------------- other rules -------------------------------------------------------------------
-
-rule "50: Purity Hint"
+rule "merge intersecting Entities of same type"
+    salience 64
     when
-        Section(searchText.toLowerCase().contains("purity"))
+        $first: RedactionEntity($type: type, $entityType: entityType, !resized, !skipRemoveEntitiesContainedInLarger)
+        $second: RedactionEntity(intersects($first), type == $type, entityType == $entityType, this != $first, !resized, !skipRemoveEntitiesContainedInLarger)
     then
-	    section.addHintAnnotationByRegEx("(purity ?( of|\\(.{1,20}\\))?( ?:)?) .{0,5}[\\d\\.]+( .{0,4}\\.)? ?%", true, 1, "hint_only",dictionary);
+        $first.removeFromGraph();
+        $second.removeFromGraph();
+        RedactionEntity mergedEntity = entityCreationService.byEntities(List.of($first, $second), $type, $entityType, document);
+        retract($first);
+        retract($second);
+        insert(mergedEntity);
     end
 
-
-rule "51: Ignore dossier_redaction entries if confidential"
+rule "remove Entity of type ENTITY when contained by FALSE_POSITIVE"
+    salience 64
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Confidentiality","confidential") && matchesType("dossier_redaction"));
+        $falsePositive: RedactionEntity($type: type, entityType == EntityType.FALSE_POSITIVE)
+        $entity: RedactionEntity(containedBy($falsePositive), type == $type, entityType == EntityType.ENTITY, !resized, !skipRemoveEntitiesContainedInLarger)
     then
-        section.ignore("dossier_redaction");
+        $entity.removeFromGraph();
+        retract($entity)
     end
 
-
-rule "52: Redact signatures (Non vertebrate study)"
+rule "remove Entity of type RECOMMENDATION when contained by FALSE_RECOMMENDATION"
+    salience 64
     when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesImageType("signature"))
+        $falseRecommendation: RedactionEntity($type: type, entityType == EntityType.FALSE_RECOMMENDATION)
+        $recommendation: RedactionEntity(containedBy($falseRecommendation), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
     then
-        section.redactImage("signature", 52, "Signature found", "Article 39(e)(3) of Regulation (EC) No 178/2002");
+        $recommendation.removeFromGraph();
+        retract($recommendation);
     end
 
-
-rule "53: Redact signatures (Vertebrate study)"
+rule "remove Entity of type RECOMMENDATION when intersected by ENTITY with same type"
+    salience 256
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesImageType("signature"))
+        $entity: RedactionEntity($type: type, entityType == EntityType.ENTITY)
+        $recommendation: RedactionEntity(intersects($entity), type == $type, entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
     then
-        section.redactImage("signature", 53, "Signature found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $entity.addEngines($recommendation.getEngines());
+        $recommendation.removeFromGraph();
+        retract($recommendation);
     end
 
-
-rule "54: Redact Logos (Vertebrate study)"
+rule "remove Entity of type RECOMMENDATION when contained by ENTITY"
+    salience 256
     when
-        Section(fileAttributeByLabelEqualsIgnoreCase("Vertebrate Study","Yes") && matchesImageType("logo"))
+        $entity: RedactionEntity(entityType == EntityType.ENTITY)
+        $recommendation: RedactionEntity(containedBy($entity), entityType == EntityType.RECOMMENDATION, !resized, !skipRemoveEntitiesContainedInLarger)
     then
-        section.redactImage("logo", 54, "Logo found", "Article 39(e)(2) of Regulation (EC) No 178/2002");
+        $recommendation.removeFromGraph();
+        retract($recommendation);
+    end
+
+rule "remove Entity of lower rank, when equal boundaries and entityType"
+    salience 32
+    when
+        $higherRank: RedactionEntity($type: type, $entityType: entityType, $boundary: boundary)
+        $lowerRank: RedactionEntity($boundary == boundary, type != $type, entityType == $entityType, dictionary.getDictionaryRank(type) < dictionary.getDictionaryRank($type), !redaction)
+    then
+        $lowerRank.removeFromGraph();
+        retract($lowerRank);
+    end
+
+// --------------------------------------- FileAttribute Rules -------------------------------------------------------------------
+
+rule "remove duplicate FileAttributes"
+    salience 64
+    when
+        $fileAttribute: FileAttribute($label: label, $value: value)
+        $duplicate: FileAttribute(this != $fileAttribute, label == $label, value == $value)
+    then
+        retract($duplicate);
+    end
+
+// --------------------------------------- local dictionary search -------------------------------------------------------------------
+
+rule "run local dictionary search"
+    agenda-group "LOCAL_DICTIONARY_ADDS"
+    salience -999
+    when
+        DictionaryModel(!localEntries.isEmpty(), $type: type, $searchImplementation: localSearch) from dictionary.getDictionaryModels()
+    then
+        entityCreationService.bySearchImplementation($searchImplementation, $type, EntityType.RECOMMENDATION, document)
+            .forEach(entity -> {
+                entity.addEngine(Engine.RULE);
+                insert(entity);
+            });
     end