From 607aff769bc98bd726fe408e5552960677048f03 Mon Sep 17 00:00:00 2001
From: Joris Baum <joris@audriga.com>
Date: Wed, 16 Oct 2024 17:11:58 +0200
Subject: [PATCH 1/4] Create three main packages and JARs

---
 README.md                                     | 23 +++----
 build.xml                                     | 16 ++++-
 .../mime/AbstractMessageBuilder.java          |  8 +--
 .../mime/GenericStructuredMessageBuilder.java |  4 +-
 .../mime/HtmlOnlyMessageBuilder.java          |  6 +-
 .../mime/InlineHtmlMessageBuilder.java        |  9 +--
 .../mime/MimeMultipartBuilder.java            |  6 +-
 .../MultipartAlternativeMessageBuilder.java   |  6 +-
 .../mime/MultipartRelatedMessageBuilder.java  |  6 +-
 .../mime/StructuredDataContentHandler.java    |  4 +-
 .../StructuredDataContentHandlerFactory.java  |  4 +-
 .../mime/StructuredMimeMessageWrapper.java    |  6 +-
 .../model/MimeTextContent.java                |  2 +-
 .../parser/JakartaMailUtils.java              |  6 +-
 .../{ => extension}/sender/EmailSender.java   |  6 +-
 .../sender/StructuredMimeParseUtils.java      | 65 ++++++++++++++++++
 .../{ => h2lj}/model/StructuredContext.java   |  2 +-
 .../sml/{ => h2lj}/model/StructuredData.java  |  2 +-
 .../{ => h2lj}/model/StructuredSyntax.java    |  2 +-
 .../StructuredDataExtractionUtils.java}       | 66 ++-----------------
 .../jakarta/sml/scanner/cli/CliHandler.java   |  6 +-
 .../jakarta/sml/scanner/cli/FileDumper.java   |  6 +-
 .../sml/scanner/imap/ImapEmailProcessor.java  |  9 +--
 .../sml/MailProcessingAdvancedTest.java       |  4 +-
 .../jakarta/sml/MailProcessingTest.java       |  6 +-
 test/com/audriga/jakarta/sml/TestUtils.java   |  7 +-
 .../sml/data/MultipartRelatedEmail.java       |  6 +-
 .../audriga/jakarta/sml/data/SimpleEmail.java |  8 +--
 .../audriga/jakarta/sml/scanner/ImapTest.java |  2 +-
 .../jakarta/sml/scanner/ParserTest.java       | 14 ++--
 .../sml/scanner/cli/FileDumperTest.java       |  7 +-
 .../jakarta/sml/sender/EmailSenderIT.java     |  1 +
 32 files changed, 174 insertions(+), 151 deletions(-)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/AbstractMessageBuilder.java (94%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/GenericStructuredMessageBuilder.java (94%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/HtmlOnlyMessageBuilder.java (88%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/InlineHtmlMessageBuilder.java (91%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/MimeMultipartBuilder.java (96%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/MultipartAlternativeMessageBuilder.java (93%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/MultipartRelatedMessageBuilder.java (92%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/StructuredDataContentHandler.java (94%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/StructuredDataContentHandlerFactory.java (80%)
 rename src/com/audriga/jakarta/sml/{ => extension}/mime/StructuredMimeMessageWrapper.java (96%)
 rename src/com/audriga/jakarta/sml/{ => extension}/model/MimeTextContent.java (88%)
 rename src/com/audriga/jakarta/sml/{ => extension}/parser/JakartaMailUtils.java (81%)
 rename src/com/audriga/jakarta/sml/{ => extension}/sender/EmailSender.java (96%)
 create mode 100644 src/com/audriga/jakarta/sml/extension/sender/StructuredMimeParseUtils.java
 rename src/com/audriga/jakarta/sml/{ => h2lj}/model/StructuredContext.java (83%)
 rename src/com/audriga/jakarta/sml/{ => h2lj}/model/StructuredData.java (98%)
 rename src/com/audriga/jakarta/sml/{ => h2lj}/model/StructuredSyntax.java (74%)
 rename src/com/audriga/jakarta/sml/{parser/StructuredMimeParseUtils.java => h2lj/parser/StructuredDataExtractionUtils.java} (67%)

diff --git a/README.md b/README.md
index 2217635..0ec354d 100644
--- a/README.md
+++ b/README.md
@@ -24,29 +24,28 @@ The goal of this library is to support and showcase multiple possible approaches
 To create structured email messages, simply use the generator to create a MIME message with structured data included in the HTML body via `<script>` tag:
 
 ```java
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
-import com.audriga.jakarta.sml.mime.InlineHtmlMessageBuilder;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.mime.InlineHtmlMessageBuilder;
 import jakarta.mail.MessagingException;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 public class Example {
 
     public static void main(String[] args) throws MessagingException {
-    
+
         // Comment email content elements
         String emailSubject = "My first structured email";
         String textEmailBody = "This is a test email";
         String htmlEmailBody = "<html><body>This is a <b>test email</b></body></html>";
-    
+
         // Structured data
         String jsonLd = "{\r\n    \"@context\":              \"http://schema.org\",\r\n    \"@type\":                 \"EventReservation\",\r\n    \"reservationId\":         \"MBE12345\",\r\n    \"underName\": {\r\n        \"@type\":               \"Person\",\r\n        \"name\":                \"Noah Baumbach\"\r\n    },\r\n    \"reservationFor\": {\r\n        \"@type\":               \"Event\",\r\n        \"name\":                \"Make Better Email 2024\",\r\n        \"startDate\":           \"2024-10-15\",\r\n        \"organizer\": {\r\n            \"@type\":            \"Organization\",\r\n            \"name\":             \"Fastmail Pty Ltd.\",\r\n            \"logo\":             \"https://www.fastmail.com/assets/images/FM-Logo-RGB-IiFj8alCx1-3073.webp\"\r\n        },\r\n        \"location\": {\r\n            \"@type\":             \"Place\",\r\n            \"name\":              \"Isode Ltd\",\r\n            \"address\": {\r\n                \"@type\":           \"PostalAddress\",\r\n                \"streetAddress\":   \"14 Castle Mews\",\r\n                \"addressLocality\": \"Hampton\",\r\n                \"addressRegion\":   \"Greater London\",\r\n                \"postalCode\":      \"TW12 2NP\",\r\n                \"addressCountry\":  \"UK\"\r\n            }\r\n        }\r\n    }\r\n}";
 
         List<StructuredData> structuredDataList = new ArrayList<>();
         structuredDataList.add(new StructuredData(jsonLd));
-            
+
         StructuredMimeMessageWrapper message = new InlineHtmlMessageBuilder()
                 .subject(emailSubject)
                 .textBody(textEmailBody)
@@ -64,19 +63,17 @@ public class Example {
 To parse structured email messages, you can use the provided classes and methods to extract structured data from the email content.
 
 ```java
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
 import com.audriga.jakarta.sml.parser.StructuredEmailParser;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.internet.MimeMessage;
 
-import java.util.List;
-
 public class Example {
 
     public static void main(String[] args) throws Exception {
-    
+
         MimeMessage message = ... // obtain a MimeMessage instance
-        
+
         StructuredMimeMessageWrapper structuredMessage = new StructuredMimeParser().parseMessage(message);
 
         for (StructuredData data : structuredMessage.getStructuredData()) {
diff --git a/build.xml b/build.xml
index 90413af..4dbfec9 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
         </copy>
     </target>
 
-    <target name="jar" depends="resolve,compile" description="Create a jar file">
+    <target name="jar-scanner" depends="resolve,compile" description="Create a jar file">
         <mkdir dir="${dist-dir}"/>
         <jar jarfile="${dist-dir}/__temp.jar">
             <zipgroupfileset dir="${lib-source}">
@@ -42,6 +42,20 @@
         </jar>
     </target>
 
+    <target name="jar-h2lj" depends="resolve,compile" description="Create a jar file">
+        <mkdir dir="${dist-dir}"/>
+        <jar jarfile="${dist-dir}/h2lj.jar" basedir="${bin}">
+            <fileset dir="${bin}" includes="src/com/audriga/jakarta/sml/h2lj/**/*.class" />
+        </jar>
+    </target>
+
+    <target name="jar" depends="resolve,compile" description="Create a jar file">
+        <mkdir dir="${dist-dir}"/>
+        <jar jarfile="${dist-dir}/jakarta-structured-email.jar" basedir="${bin}">
+            <fileset dir="${bin}" includes="src/com/audriga/jakarta/sml/h2lj/**/*.class" />
+            <fileset dir="${bin}" includes="src/com/audriga/jakarta/sml/extension/**/*.class" />
+        </jar>
+    </target>
 
     <target name="clean" description="Cleans this project">
         <delete dir="${bin}" failonerror="false" />
diff --git a/src/com/audriga/jakarta/sml/mime/AbstractMessageBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/AbstractMessageBuilder.java
similarity index 94%
rename from src/com/audriga/jakarta/sml/mime/AbstractMessageBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/AbstractMessageBuilder.java
index 2a455ea..fb2aa77 100644
--- a/src/com/audriga/jakarta/sml/mime/AbstractMessageBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/AbstractMessageBuilder.java
@@ -1,8 +1,8 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.model.StructuredSyntax;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
 import jakarta.activation.DataHandler;
 import jakarta.mail.Address;
 import jakarta.mail.MessagingException;
diff --git a/src/com/audriga/jakarta/sml/mime/GenericStructuredMessageBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/GenericStructuredMessageBuilder.java
similarity index 94%
rename from src/com/audriga/jakarta/sml/mime/GenericStructuredMessageBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/GenericStructuredMessageBuilder.java
index 3fc735e..42636d5 100644
--- a/src/com/audriga/jakarta/sml/mime/GenericStructuredMessageBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/GenericStructuredMessageBuilder.java
@@ -1,6 +1,6 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import jakarta.mail.Multipart;
diff --git a/src/com/audriga/jakarta/sml/mime/HtmlOnlyMessageBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/HtmlOnlyMessageBuilder.java
similarity index 88%
rename from src/com/audriga/jakarta/sml/mime/HtmlOnlyMessageBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/HtmlOnlyMessageBuilder.java
index 26c7d3e..db34de0 100644
--- a/src/com/audriga/jakarta/sml/mime/HtmlOnlyMessageBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/HtmlOnlyMessageBuilder.java
@@ -1,7 +1,7 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 
diff --git a/src/com/audriga/jakarta/sml/mime/InlineHtmlMessageBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/InlineHtmlMessageBuilder.java
similarity index 91%
rename from src/com/audriga/jakarta/sml/mime/InlineHtmlMessageBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/InlineHtmlMessageBuilder.java
index 9f93e3d..4865ff3 100644
--- a/src/com/audriga/jakarta/sml/mime/InlineHtmlMessageBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/InlineHtmlMessageBuilder.java
@@ -1,12 +1,9 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
-import jakarta.mail.Session;
-
-import java.util.Properties;
 
 public class InlineHtmlMessageBuilder extends AbstractMessageBuilder<InlineHtmlMessageBuilder> {
 
diff --git a/src/com/audriga/jakarta/sml/mime/MimeMultipartBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/MimeMultipartBuilder.java
similarity index 96%
rename from src/com/audriga/jakarta/sml/mime/MimeMultipartBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/MimeMultipartBuilder.java
index 35ced20..b3cfdf8 100644
--- a/src/com/audriga/jakarta/sml/mime/MimeMultipartBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/MimeMultipartBuilder.java
@@ -1,7 +1,7 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.activation.DataHandler;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeBodyPart;
diff --git a/src/com/audriga/jakarta/sml/mime/MultipartAlternativeMessageBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/MultipartAlternativeMessageBuilder.java
similarity index 93%
rename from src/com/audriga/jakarta/sml/mime/MultipartAlternativeMessageBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/MultipartAlternativeMessageBuilder.java
index 48b32c6..077ff0d 100644
--- a/src/com/audriga/jakarta/sml/mime/MultipartAlternativeMessageBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/MultipartAlternativeMessageBuilder.java
@@ -1,7 +1,7 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 
diff --git a/src/com/audriga/jakarta/sml/mime/MultipartRelatedMessageBuilder.java b/src/com/audriga/jakarta/sml/extension/mime/MultipartRelatedMessageBuilder.java
similarity index 92%
rename from src/com/audriga/jakarta/sml/mime/MultipartRelatedMessageBuilder.java
rename to src/com/audriga/jakarta/sml/extension/mime/MultipartRelatedMessageBuilder.java
index 6405342..05c3a44 100644
--- a/src/com/audriga/jakarta/sml/mime/MultipartRelatedMessageBuilder.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/MultipartRelatedMessageBuilder.java
@@ -1,7 +1,7 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMultipart;
diff --git a/src/com/audriga/jakarta/sml/mime/StructuredDataContentHandler.java b/src/com/audriga/jakarta/sml/extension/mime/StructuredDataContentHandler.java
similarity index 94%
rename from src/com/audriga/jakarta/sml/mime/StructuredDataContentHandler.java
rename to src/com/audriga/jakarta/sml/extension/mime/StructuredDataContentHandler.java
index 79b674e..8bb0026 100644
--- a/src/com/audriga/jakarta/sml/mime/StructuredDataContentHandler.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/StructuredDataContentHandler.java
@@ -1,6 +1,6 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.activation.ActivationDataFlavor;
 import jakarta.activation.DataSource;
 import org.eclipse.angus.mail.handlers.text_plain;
diff --git a/src/com/audriga/jakarta/sml/mime/StructuredDataContentHandlerFactory.java b/src/com/audriga/jakarta/sml/extension/mime/StructuredDataContentHandlerFactory.java
similarity index 80%
rename from src/com/audriga/jakarta/sml/mime/StructuredDataContentHandlerFactory.java
rename to src/com/audriga/jakarta/sml/extension/mime/StructuredDataContentHandlerFactory.java
index 82c15d4..5a2f0d2 100644
--- a/src/com/audriga/jakarta/sml/mime/StructuredDataContentHandlerFactory.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/StructuredDataContentHandlerFactory.java
@@ -1,6 +1,6 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.activation.DataContentHandler;
 import jakarta.activation.DataContentHandlerFactory;
 
diff --git a/src/com/audriga/jakarta/sml/mime/StructuredMimeMessageWrapper.java b/src/com/audriga/jakarta/sml/extension/mime/StructuredMimeMessageWrapper.java
similarity index 96%
rename from src/com/audriga/jakarta/sml/mime/StructuredMimeMessageWrapper.java
rename to src/com/audriga/jakarta/sml/extension/mime/StructuredMimeMessageWrapper.java
index 198a49b..8d5a556 100644
--- a/src/com/audriga/jakarta/sml/mime/StructuredMimeMessageWrapper.java
+++ b/src/com/audriga/jakarta/sml/extension/mime/StructuredMimeMessageWrapper.java
@@ -1,7 +1,7 @@
-package com.audriga.jakarta.sml.mime;
+package com.audriga.jakarta.sml.extension.mime;
 
-import com.audriga.jakarta.sml.model.MimeTextContent;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.*;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeMessage;
diff --git a/src/com/audriga/jakarta/sml/model/MimeTextContent.java b/src/com/audriga/jakarta/sml/extension/model/MimeTextContent.java
similarity index 88%
rename from src/com/audriga/jakarta/sml/model/MimeTextContent.java
rename to src/com/audriga/jakarta/sml/extension/model/MimeTextContent.java
index ac8f532..0b2f464 100644
--- a/src/com/audriga/jakarta/sml/model/MimeTextContent.java
+++ b/src/com/audriga/jakarta/sml/extension/model/MimeTextContent.java
@@ -1,4 +1,4 @@
-package com.audriga.jakarta.sml.model;
+package com.audriga.jakarta.sml.extension.model;
 
 public class MimeTextContent {
         private String text;
diff --git a/src/com/audriga/jakarta/sml/parser/JakartaMailUtils.java b/src/com/audriga/jakarta/sml/extension/parser/JakartaMailUtils.java
similarity index 81%
rename from src/com/audriga/jakarta/sml/parser/JakartaMailUtils.java
rename to src/com/audriga/jakarta/sml/extension/parser/JakartaMailUtils.java
index 9a237ba..d07b1fc 100644
--- a/src/com/audriga/jakarta/sml/parser/JakartaMailUtils.java
+++ b/src/com/audriga/jakarta/sml/extension/parser/JakartaMailUtils.java
@@ -1,6 +1,8 @@
-package com.audriga.jakarta.sml.parser;
+package com.audriga.jakarta.sml.extension.parser;
 
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.sender.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
 import jakarta.mail.Session;
 import jakarta.mail.internet.MimeMessage;
 
diff --git a/src/com/audriga/jakarta/sml/sender/EmailSender.java b/src/com/audriga/jakarta/sml/extension/sender/EmailSender.java
similarity index 96%
rename from src/com/audriga/jakarta/sml/sender/EmailSender.java
rename to src/com/audriga/jakarta/sml/extension/sender/EmailSender.java
index b9fb6b8..25d9f3c 100644
--- a/src/com/audriga/jakarta/sml/sender/EmailSender.java
+++ b/src/com/audriga/jakarta/sml/extension/sender/EmailSender.java
@@ -1,7 +1,7 @@
-package com.audriga.jakarta.sml.sender;
+package com.audriga.jakarta.sml.extension.sender;
 
-import com.audriga.jakarta.sml.mime.*;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.mime.*;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.*;
 
 import java.io.IOException;
diff --git a/src/com/audriga/jakarta/sml/extension/sender/StructuredMimeParseUtils.java b/src/com/audriga/jakarta/sml/extension/sender/StructuredMimeParseUtils.java
new file mode 100644
index 0000000..04a2f16
--- /dev/null
+++ b/src/com/audriga/jakarta/sml/extension/sender/StructuredMimeParseUtils.java
@@ -0,0 +1,65 @@
+package com.audriga.jakarta.sml.extension.sender;
+
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.model.MimeTextContent;
+import jakarta.mail.BodyPart;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class StructuredMimeParseUtils {
+    protected static final String TEXT = "text";
+    protected static final String TEXT_PLAIN = "text/plain";
+    protected static final String TEXT_ASCII = "text/ascii";
+    protected static final String TEXT_HTML = "text/html";
+
+    public static StructuredMimeMessageWrapper parseMessage(MimeMessage message) throws MessagingException, IOException {
+        StructuredMimeMessageWrapper smw = new StructuredMimeMessageWrapper(message);
+        MimeTextContent htmlContent = parseBody(message, Collections.singletonList(TEXT_HTML));
+        smw.setHtmlBody(htmlContent);
+        smw.setTextBody(parseBody(message, Arrays.asList(TEXT, TEXT_PLAIN, TEXT_ASCII)));
+
+        return smw;
+    }
+
+    public static MimeTextContent parseBody(MimeMessage message, List<String> mimeTypes) throws MessagingException, IOException {
+        for (String mimeType : mimeTypes) {
+            if (message.isMimeType(mimeType)) {
+                return new MimeTextContent((String) message.getContent(), message.getEncoding());
+            }
+        }
+        if (message.isMimeType("multipart/*")) {
+            MimeMultipart mimeMultipart = (MimeMultipart) message.getContent();
+            return getBodyFromMultipart(mimeMultipart, mimeTypes);
+        }
+        return null;
+    }
+
+    private static MimeTextContent getBodyFromMultipart(MimeMultipart mimeMultipart, List<String> mimeTypes) throws MessagingException, IOException {
+        for (int i = 0; i < mimeMultipart.getCount(); i++) {
+            BodyPart bodyPart = mimeMultipart.getBodyPart(i);
+            for (String mimeType : mimeTypes) {
+                if (bodyPart.isMimeType(mimeType)) {
+                    String contentType = bodyPart.getContentType().toLowerCase();
+                    ContentType contentTypeObject = new ContentType(contentType);
+                    String charset = contentTypeObject.getParameter("charset");
+                    return new MimeTextContent((String) bodyPart.getContent(), charset);
+                }
+            }
+            if (bodyPart.isMimeType("multipart/*")) {
+                MimeMultipart nestedMultipart = (MimeMultipart) bodyPart.getContent();
+                MimeTextContent body = getBodyFromMultipart(nestedMultipart, mimeTypes);
+                if (body != null) {
+                    return body;
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/audriga/jakarta/sml/model/StructuredContext.java b/src/com/audriga/jakarta/sml/h2lj/model/StructuredContext.java
similarity index 83%
rename from src/com/audriga/jakarta/sml/model/StructuredContext.java
rename to src/com/audriga/jakarta/sml/h2lj/model/StructuredContext.java
index aee9f9d..0896bc7 100644
--- a/src/com/audriga/jakarta/sml/model/StructuredContext.java
+++ b/src/com/audriga/jakarta/sml/h2lj/model/StructuredContext.java
@@ -1,4 +1,4 @@
-package com.audriga.jakarta.sml.model;
+package com.audriga.jakarta.sml.h2lj.model;
 
 public enum StructuredContext {
     SCHEMA_ORG("https://schema.org");
diff --git a/src/com/audriga/jakarta/sml/model/StructuredData.java b/src/com/audriga/jakarta/sml/h2lj/model/StructuredData.java
similarity index 98%
rename from src/com/audriga/jakarta/sml/model/StructuredData.java
rename to src/com/audriga/jakarta/sml/h2lj/model/StructuredData.java
index c01bf4e..4315b27 100644
--- a/src/com/audriga/jakarta/sml/model/StructuredData.java
+++ b/src/com/audriga/jakarta/sml/h2lj/model/StructuredData.java
@@ -1,4 +1,4 @@
-package com.audriga.jakarta.sml.model;
+package com.audriga.jakarta.sml.h2lj.model;
 
 import org.json.JSONObject;
 import org.jspecify.annotations.NonNull;
diff --git a/src/com/audriga/jakarta/sml/model/StructuredSyntax.java b/src/com/audriga/jakarta/sml/h2lj/model/StructuredSyntax.java
similarity index 74%
rename from src/com/audriga/jakarta/sml/model/StructuredSyntax.java
rename to src/com/audriga/jakarta/sml/h2lj/model/StructuredSyntax.java
index 4d9d821..c1e9d1d 100644
--- a/src/com/audriga/jakarta/sml/model/StructuredSyntax.java
+++ b/src/com/audriga/jakarta/sml/h2lj/model/StructuredSyntax.java
@@ -1,4 +1,4 @@
-package com.audriga.jakarta.sml.model;
+package com.audriga.jakarta.sml.h2lj.model;
 
 public enum StructuredSyntax {
     JSON_LD,
diff --git a/src/com/audriga/jakarta/sml/parser/StructuredMimeParseUtils.java b/src/com/audriga/jakarta/sml/h2lj/parser/StructuredDataExtractionUtils.java
similarity index 67%
rename from src/com/audriga/jakarta/sml/parser/StructuredMimeParseUtils.java
rename to src/com/audriga/jakarta/sml/h2lj/parser/StructuredDataExtractionUtils.java
index 5a682eb..4e9a64f 100644
--- a/src/com/audriga/jakarta/sml/parser/StructuredMimeParseUtils.java
+++ b/src/com/audriga/jakarta/sml/h2lj/parser/StructuredDataExtractionUtils.java
@@ -1,19 +1,13 @@
-package com.audriga.jakarta.sml.parser;
+package com.audriga.jakarta.sml.h2lj.parser;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
-import com.audriga.jakarta.sml.model.*;
-import jakarta.mail.BodyPart;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.ContentType;
-import jakarta.mail.internet.MimeMessage;
-import jakarta.mail.internet.MimeMultipart;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jsoup.Jsoup;
@@ -21,56 +15,8 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-public class StructuredMimeParseUtils {
-    private static final Logger mLogger = Logger.getLogger(StructuredMimeParseUtils.class.getName());
-    protected static final String TEXT = "text";
-    protected static final String TEXT_PLAIN = "text/plain";
-    protected static final String TEXT_ASCII = "text/ascii";
-    protected static final String TEXT_HTML = "text/html";
-
-    public static StructuredMimeMessageWrapper parseMessage(MimeMessage message) throws MessagingException, IOException {
-        StructuredMimeMessageWrapper smw = new StructuredMimeMessageWrapper(message);
-        MimeTextContent htmlContent = parseBody(message, Collections.singletonList(TEXT_HTML));
-        smw.setHtmlBody(htmlContent);
-        smw.setTextBody(parseBody(message, Arrays.asList(TEXT, TEXT_PLAIN, TEXT_ASCII)));
-
-        return smw;
-    }
-
-    public static MimeTextContent parseBody(MimeMessage message, List<String> mimeTypes) throws MessagingException, IOException {
-        for (String mimeType : mimeTypes) {
-            if (message.isMimeType(mimeType)) {
-                return new MimeTextContent((String) message.getContent(), message.getEncoding());
-            }
-        }
-        if (message.isMimeType("multipart/*")) {
-            MimeMultipart mimeMultipart = (MimeMultipart) message.getContent();
-            return getBodyFromMultipart(mimeMultipart, mimeTypes);
-        }
-        return null;
-    }
-
-    private static MimeTextContent getBodyFromMultipart(MimeMultipart mimeMultipart, List<String> mimeTypes) throws MessagingException, IOException {
-        for (int i = 0; i < mimeMultipart.getCount(); i++) {
-            BodyPart bodyPart = mimeMultipart.getBodyPart(i);
-            for (String mimeType : mimeTypes) {
-                if (bodyPart.isMimeType(mimeType)) {
-                    String contentType = bodyPart.getContentType().toLowerCase();
-                    ContentType contentTypeObject = new ContentType(contentType);
-                    String charset = contentTypeObject.getParameter("charset");
-                    return new MimeTextContent((String) bodyPart.getContent(), charset);
-                }
-            }
-            if (bodyPart.isMimeType("multipart/*")) {
-                MimeMultipart nestedMultipart = (MimeMultipart) bodyPart.getContent();
-                MimeTextContent body = getBodyFromMultipart(nestedMultipart, mimeTypes);
-                if (body != null) {
-                    return body;
-                }
-            }
-        }
-        return null;
-    }
+public class StructuredDataExtractionUtils {
+    private static final Logger mLogger = Logger.getLogger(StructuredDataExtractionUtils.class.getName());
 
     public static List<StructuredData> parseStructuredDataPart(String html, StructuredSyntax syntax) {
         // TODO Filter irrelevant schema.org types (e.g. BreadcrumbList)
diff --git a/src/com/audriga/jakarta/sml/scanner/cli/CliHandler.java b/src/com/audriga/jakarta/sml/scanner/cli/CliHandler.java
index 3f87fa7..cb479ad 100644
--- a/src/com/audriga/jakarta/sml/scanner/cli/CliHandler.java
+++ b/src/com/audriga/jakarta/sml/scanner/cli/CliHandler.java
@@ -1,10 +1,10 @@
 package com.audriga.jakarta.sml.scanner.cli;
 
-import com.audriga.jakarta.sml.model.StructuredSyntax;
+import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
 import com.audriga.jakarta.sml.scanner.imap.ImapEmailProcessor;
 import com.audriga.jakarta.sml.scanner.logging.SimpleCliFormatter;
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import jakarta.mail.Folder;
 import jakarta.mail.MessagingException;
 import org.apache.commons.cli.*;
diff --git a/src/com/audriga/jakarta/sml/scanner/cli/FileDumper.java b/src/com/audriga/jakarta/sml/scanner/cli/FileDumper.java
index 2921aa7..f43fc00 100644
--- a/src/com/audriga/jakarta/sml/scanner/cli/FileDumper.java
+++ b/src/com/audriga/jakarta/sml/scanner/cli/FileDumper.java
@@ -1,8 +1,8 @@
 package com.audriga.jakarta.sml.scanner.cli;
 
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.model.StructuredSyntax;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
 import jakarta.mail.Folder;
 import jakarta.mail.MessagingException;
 
diff --git a/src/com/audriga/jakarta/sml/scanner/imap/ImapEmailProcessor.java b/src/com/audriga/jakarta/sml/scanner/imap/ImapEmailProcessor.java
index ef72103..594b315 100644
--- a/src/com/audriga/jakarta/sml/scanner/imap/ImapEmailProcessor.java
+++ b/src/com/audriga/jakarta/sml/scanner/imap/ImapEmailProcessor.java
@@ -1,8 +1,9 @@
 package com.audriga.jakarta.sml.scanner.imap;
 
-import com.audriga.jakarta.sml.mime.*;
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.parser.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.sender.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
 import jakarta.mail.*;
 import jakarta.mail.internet.MimeMessage;
 
@@ -84,7 +85,7 @@ public List<StructuredMimeMessageWrapper> scanForSchema(Folder folder) {
                     MimeMessage mm = (MimeMessage)m;
 
                     StructuredMimeMessageWrapper ma = StructuredMimeParseUtils.parseMessage(mm);
-                        ma.setStructuredData(StructuredMimeParseUtils.parseStructuredDataFromHtml(ma));
+                        ma.setStructuredData(StructuredDataExtractionUtils.parseStructuredDataFromHtml(ma));
                     List<StructuredData> structuredData = ma.getStructuredData();
                     if (structuredData != null) {
                         // Determine from
diff --git a/test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java b/test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java
index 7f2faa8..4b3d63e 100644
--- a/test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java
+++ b/test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java
@@ -1,7 +1,7 @@
 package com.audriga.jakarta.sml;
 
-import com.audriga.jakarta.sml.mime.*;
-import com.audriga.jakarta.sml.model.StructuredData;
+import com.audriga.jakarta.sml.extension.mime.*;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import com.audriga.jakarta.sml.data.MultipartRelatedEmail;
 import com.audriga.jakarta.sml.data.SimpleEmail;
 import jakarta.mail.MessagingException;
diff --git a/test/com/audriga/jakarta/sml/MailProcessingTest.java b/test/com/audriga/jakarta/sml/MailProcessingTest.java
index fc59b6c..434d6dd 100644
--- a/test/com/audriga/jakarta/sml/MailProcessingTest.java
+++ b/test/com/audriga/jakarta/sml/MailProcessingTest.java
@@ -1,7 +1,7 @@
 package com.audriga.jakarta.sml;
-import com.audriga.jakarta.sml.mime.InlineHtmlMessageBuilder;
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.mime.InlineHtmlMessageBuilder;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
 import com.audriga.jakarta.sml.data.SimpleEmail;
 import jakarta.mail.MessagingException;
 import org.testng.annotations.BeforeClass;
diff --git a/test/com/audriga/jakarta/sml/TestUtils.java b/test/com/audriga/jakarta/sml/TestUtils.java
index e46f211..56b50d8 100644
--- a/test/com/audriga/jakarta/sml/TestUtils.java
+++ b/test/com/audriga/jakarta/sml/TestUtils.java
@@ -1,7 +1,8 @@
 package com.audriga.jakarta.sml;
 
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
-import com.audriga.jakarta.sml.parser.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.sender.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
 import jakarta.mail.MessagingException;
 import jakarta.mail.Session;
 import jakarta.mail.internet.MimeMessage;
@@ -70,7 +71,7 @@ public static StructuredMimeMessageWrapper parseEmlFile(String filename) throws
         Session session = Session.getDefaultInstance(new Properties());
         MimeMessage msg = new MimeMessage(session, inputStream);
         StructuredMimeMessageWrapper smw = StructuredMimeParseUtils.parseMessage(msg);
-        smw.setStructuredData(StructuredMimeParseUtils.parseStructuredDataFromHtml(smw));
+        smw.setStructuredData(StructuredDataExtractionUtils.parseStructuredDataFromHtml(smw));
         return smw;
     }
 }
diff --git a/test/com/audriga/jakarta/sml/data/MultipartRelatedEmail.java b/test/com/audriga/jakarta/sml/data/MultipartRelatedEmail.java
index 1aaa906..5e353b8 100644
--- a/test/com/audriga/jakarta/sml/data/MultipartRelatedEmail.java
+++ b/test/com/audriga/jakarta/sml/data/MultipartRelatedEmail.java
@@ -1,7 +1,7 @@
 package com.audriga.jakarta.sml.data;
 
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.parser.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
 import com.audriga.jakarta.sml.TestUtils;
 
 import java.util.List;
@@ -23,6 +23,6 @@ public static String getTextBody() {
 
     public static List<StructuredData> getJson() {
         String json = TestUtils.readResource("jsonld/event-reservation-better.json");
-        return StructuredMimeParseUtils.parseStructuredDataFromJsonStr(json);
+        return StructuredDataExtractionUtils.parseStructuredDataFromJsonStr(json);
     }
 }
diff --git a/test/com/audriga/jakarta/sml/data/SimpleEmail.java b/test/com/audriga/jakarta/sml/data/SimpleEmail.java
index b025f80..1028257 100644
--- a/test/com/audriga/jakarta/sml/data/SimpleEmail.java
+++ b/test/com/audriga/jakarta/sml/data/SimpleEmail.java
@@ -1,7 +1,7 @@
 package com.audriga.jakarta.sml.data;
 
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.parser.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
 import com.audriga.jakarta.sml.TestUtils;
 
 import java.util.List;
@@ -36,11 +36,11 @@ public static String getTextBody() {
 
     public static List<StructuredData> getJson() {
         String json = TestUtils.readResource("jsonld/event-reservation-better.json");
-        return StructuredMimeParseUtils.parseStructuredDataFromJsonStr(json);
+        return StructuredDataExtractionUtils.parseStructuredDataFromJsonStr(json);
     }
 
     public static List<StructuredData> getJsonArray() {
         String json = TestUtils.readResource("jsonld/promotion-card.json");
-        return StructuredMimeParseUtils.parseStructuredDataFromJsonStr(json);
+        return StructuredDataExtractionUtils.parseStructuredDataFromJsonStr(json);
     }
 }
\ No newline at end of file
diff --git a/test/com/audriga/jakarta/sml/scanner/ImapTest.java b/test/com/audriga/jakarta/sml/scanner/ImapTest.java
index 8c8d591..dc38a9a 100644
--- a/test/com/audriga/jakarta/sml/scanner/ImapTest.java
+++ b/test/com/audriga/jakarta/sml/scanner/ImapTest.java
@@ -1,7 +1,7 @@
 package com.audriga.jakarta.sml.scanner;
 
 import com.audriga.jakarta.sml.scanner.imap.ImapEmailProcessor;
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
 import com.audriga.jakarta.sml.TestUtils;
 import jakarta.mail.*;
 import jakarta.mail.internet.MimeMessage;
diff --git a/test/com/audriga/jakarta/sml/scanner/ParserTest.java b/test/com/audriga/jakarta/sml/scanner/ParserTest.java
index 13b18aa..c05a8d2 100644
--- a/test/com/audriga/jakarta/sml/scanner/ParserTest.java
+++ b/test/com/audriga/jakarta/sml/scanner/ParserTest.java
@@ -1,8 +1,8 @@
 package com.audriga.jakarta.sml.scanner;
 
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.model.StructuredSyntax;
-import com.audriga.jakarta.sml.parser.StructuredMimeParseUtils;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
+import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
 import com.audriga.jakarta.sml.TestUtils;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -23,7 +23,7 @@ public void testGetJsonLd() {
         // Read from jsonld-inline-body.html file
         String html = TestUtils.readResource("html-body/jsonld-inline-body.html");
 
-        List<StructuredData> data = StructuredMimeParseUtils.parseStructuredDataPart(html, StructuredSyntax.JSON_LD);
+        List<StructuredData> data = StructuredDataExtractionUtils.parseStructuredDataPart(html, StructuredSyntax.JSON_LD);
         assertFalse(data.isEmpty());
     }
 
@@ -31,7 +31,7 @@ public void testGetJsonLd() {
     public void testGetMicrodata() {
         String html = TestUtils.readResource("microdata/flight-reservation-lufthansa.html");
 
-        List<StructuredData> data = StructuredMimeParseUtils.parseStructuredDataPart(html, StructuredSyntax.MICRODATA);
+        List<StructuredData> data = StructuredDataExtractionUtils.parseStructuredDataPart(html, StructuredSyntax.MICRODATA);
         assertFalse(data.isEmpty());
         assertEquals(data.size(), 1);
     }
@@ -40,7 +40,7 @@ public void testGetMicrodata() {
     public void testGetMicrodataWithSpan() {
         String html = TestUtils.readResource("microdata/creative-work-docusign.html");
 
-        List<StructuredData> data = StructuredMimeParseUtils.parseStructuredDataPart(html, StructuredSyntax.MICRODATA);
+        List<StructuredData> data = StructuredDataExtractionUtils.parseStructuredDataPart(html, StructuredSyntax.MICRODATA);
         assertFalse(data.isEmpty());
         assertEquals(data.size(), 1);
         StructuredData jsonData = data.get(0);
@@ -51,7 +51,7 @@ public void testGetMicrodataWithSpan() {
     public void testGetMicrodataWithTime() {
         String html = TestUtils.readResource("microdata/lodging-reservation-hrs.html");
 
-        List<StructuredData> data = StructuredMimeParseUtils.parseStructuredDataPart(html, StructuredSyntax.MICRODATA);
+        List<StructuredData> data = StructuredDataExtractionUtils.parseStructuredDataPart(html, StructuredSyntax.MICRODATA);
         assertFalse(data.isEmpty());
         assertEquals(data.size(), 1);
         StructuredData jsonData = data.get(0);
diff --git a/test/com/audriga/jakarta/sml/scanner/cli/FileDumperTest.java b/test/com/audriga/jakarta/sml/scanner/cli/FileDumperTest.java
index 843149e..e947abb 100644
--- a/test/com/audriga/jakarta/sml/scanner/cli/FileDumperTest.java
+++ b/test/com/audriga/jakarta/sml/scanner/cli/FileDumperTest.java
@@ -1,9 +1,8 @@
 package com.audriga.jakarta.sml.scanner.cli;
 
-import com.audriga.jakarta.sml.mime.StructuredMimeMessageWrapper;
-import com.audriga.jakarta.sml.model.StructuredData;
-import com.audriga.jakarta.sml.model.StructuredSyntax;
-import com.audriga.jakarta.sml.scanner.cli.FileDumper;
+import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
+import com.audriga.jakarta.sml.h2lj.model.StructuredData;
+import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
 import jakarta.mail.Folder;
 import jakarta.mail.MessagingException;
 import org.testng.annotations.Test;
diff --git a/test/com/audriga/jakarta/sml/sender/EmailSenderIT.java b/test/com/audriga/jakarta/sml/sender/EmailSenderIT.java
index b179bd9..b744d34 100644
--- a/test/com/audriga/jakarta/sml/sender/EmailSenderIT.java
+++ b/test/com/audriga/jakarta/sml/sender/EmailSenderIT.java
@@ -1,6 +1,7 @@
 package com.audriga.jakarta.sml.sender;
 
 import com.audriga.jakarta.sml.TestUtils;
+import com.audriga.jakarta.sml.extension.sender.EmailSender;
 import jakarta.mail.Address;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.InternetAddress;

From 9d8a097ece43c333bd4e10e257d71fea9f5ea3c6 Mon Sep 17 00:00:00 2001
From: Joris Baum <joris@audriga.com>
Date: Wed, 16 Oct 2024 17:41:45 +0200
Subject: [PATCH 2/4] Add info on new JARs to README

---
 README.md       |  5 +++++
 docs/h2lj.md    | 12 ++++++++++++
 docs/scanner.md |  6 +++++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 docs/h2lj.md

diff --git a/README.md b/README.md
index 0ec354d..2f61a51 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,11 @@ This project contains an IMAP account scanner command line tool, which can be us
 
 The folder `test/resources/eml` contains several example files generated with this library. Refer to the [example files documentation](docs/example-files.md) for more information.
 
+### H2LJ
+
+Part of the source code of this project can be built as a separate JAR. This can be used to extract structured data
+from HTML input. It is called Html2JSONLD (Java). See the [H2LJ documentation](docs/h2lj.md) for details.
+
 ## Contributing
 
 Contributions are welcome! Please open new issues or pull requests on GitHub.
diff --git a/docs/h2lj.md b/docs/h2lj.md
new file mode 100644
index 0000000..b43f513
--- /dev/null
+++ b/docs/h2lj.md
@@ -0,0 +1,12 @@
+# H2LJ
+
+## Overview
+
+H2LJ is a Java-based library designed to extract structured data from HTML.
+
+## Building the Project
+
+To compile the source code and create the JAR files, run:
+```sh
+ant jar-h2lj
+```
\ No newline at end of file
diff --git a/docs/scanner.md b/docs/scanner.md
index b7ffaa7..d35fc26 100644
--- a/docs/scanner.md
+++ b/docs/scanner.md
@@ -8,7 +8,11 @@ Its goal is to **find existing messages which contain Schema.org markup** (JSON-
 
 ## Building
 
-See build instructions in the [main README](../README.md#Building)
+To build the project, use the following command to create the `sml-account-scan.jar` file under `dist/`:
+
+```shell
+ant jar-scanner
+```
 
 ## Running
 

From 56b6c7c74edbdef7740bf3acbf970140d936c1ad Mon Sep 17 00:00:00 2001
From: Joris Baum <joris@audriga.com>
Date: Wed, 16 Oct 2024 18:55:32 +0200
Subject: [PATCH 3/4] Align test packages with new structure

---
 .../sml/{ => extension}/MailProcessingAdvancedTest.java        | 3 ++-
 .../jakarta/sml/{ => extension}/MailProcessingTest.java        | 3 ++-
 .../jakarta/sml/{ => extension}/sender/EmailSenderIT.java      | 3 +--
 .../jakarta/sml/{scanner => h2lj/parser}/ParserTest.java       | 3 +--
 test/com/audriga/jakarta/sml/scanner/{ => imap}/ImapTest.java  | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename test/com/audriga/jakarta/sml/{ => extension}/MailProcessingAdvancedTest.java (99%)
 rename test/com/audriga/jakarta/sml/{ => extension}/MailProcessingTest.java (98%)
 rename test/com/audriga/jakarta/sml/{ => extension}/sender/EmailSenderIT.java (91%)
 rename test/com/audriga/jakarta/sml/{scanner => h2lj/parser}/ParserTest.java (94%)
 rename test/com/audriga/jakarta/sml/scanner/{ => imap}/ImapTest.java (95%)

diff --git a/test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java b/test/com/audriga/jakarta/sml/extension/MailProcessingAdvancedTest.java
similarity index 99%
rename from test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java
rename to test/com/audriga/jakarta/sml/extension/MailProcessingAdvancedTest.java
index 4b3d63e..af3df49 100644
--- a/test/com/audriga/jakarta/sml/MailProcessingAdvancedTest.java
+++ b/test/com/audriga/jakarta/sml/extension/MailProcessingAdvancedTest.java
@@ -1,5 +1,6 @@
-package com.audriga.jakarta.sml;
+package com.audriga.jakarta.sml.extension;
 
+import com.audriga.jakarta.sml.TestUtils;
 import com.audriga.jakarta.sml.extension.mime.*;
 import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import com.audriga.jakarta.sml.data.MultipartRelatedEmail;
diff --git a/test/com/audriga/jakarta/sml/MailProcessingTest.java b/test/com/audriga/jakarta/sml/extension/MailProcessingTest.java
similarity index 98%
rename from test/com/audriga/jakarta/sml/MailProcessingTest.java
rename to test/com/audriga/jakarta/sml/extension/MailProcessingTest.java
index 434d6dd..c94c26f 100644
--- a/test/com/audriga/jakarta/sml/MailProcessingTest.java
+++ b/test/com/audriga/jakarta/sml/extension/MailProcessingTest.java
@@ -1,4 +1,5 @@
-package com.audriga.jakarta.sml;
+package com.audriga.jakarta.sml.extension;
+import com.audriga.jakarta.sml.TestUtils;
 import com.audriga.jakarta.sml.extension.mime.InlineHtmlMessageBuilder;
 import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
diff --git a/test/com/audriga/jakarta/sml/sender/EmailSenderIT.java b/test/com/audriga/jakarta/sml/extension/sender/EmailSenderIT.java
similarity index 91%
rename from test/com/audriga/jakarta/sml/sender/EmailSenderIT.java
rename to test/com/audriga/jakarta/sml/extension/sender/EmailSenderIT.java
index b744d34..30b1c31 100644
--- a/test/com/audriga/jakarta/sml/sender/EmailSenderIT.java
+++ b/test/com/audriga/jakarta/sml/extension/sender/EmailSenderIT.java
@@ -1,7 +1,6 @@
-package com.audriga.jakarta.sml.sender;
+package com.audriga.jakarta.sml.extension.sender;
 
 import com.audriga.jakarta.sml.TestUtils;
-import com.audriga.jakarta.sml.extension.sender.EmailSender;
 import jakarta.mail.Address;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.InternetAddress;
diff --git a/test/com/audriga/jakarta/sml/scanner/ParserTest.java b/test/com/audriga/jakarta/sml/h2lj/parser/ParserTest.java
similarity index 94%
rename from test/com/audriga/jakarta/sml/scanner/ParserTest.java
rename to test/com/audriga/jakarta/sml/h2lj/parser/ParserTest.java
index c05a8d2..79744d0 100644
--- a/test/com/audriga/jakarta/sml/scanner/ParserTest.java
+++ b/test/com/audriga/jakarta/sml/h2lj/parser/ParserTest.java
@@ -1,8 +1,7 @@
-package com.audriga.jakarta.sml.scanner;
+package com.audriga.jakarta.sml.h2lj.parser;
 
 import com.audriga.jakarta.sml.h2lj.model.StructuredData;
 import com.audriga.jakarta.sml.h2lj.model.StructuredSyntax;
-import com.audriga.jakarta.sml.h2lj.parser.StructuredDataExtractionUtils;
 import com.audriga.jakarta.sml.TestUtils;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/test/com/audriga/jakarta/sml/scanner/ImapTest.java b/test/com/audriga/jakarta/sml/scanner/imap/ImapTest.java
similarity index 95%
rename from test/com/audriga/jakarta/sml/scanner/ImapTest.java
rename to test/com/audriga/jakarta/sml/scanner/imap/ImapTest.java
index dc38a9a..615fb62 100644
--- a/test/com/audriga/jakarta/sml/scanner/ImapTest.java
+++ b/test/com/audriga/jakarta/sml/scanner/imap/ImapTest.java
@@ -1,6 +1,5 @@
-package com.audriga.jakarta.sml.scanner;
+package com.audriga.jakarta.sml.scanner.imap;
 
-import com.audriga.jakarta.sml.scanner.imap.ImapEmailProcessor;
 import com.audriga.jakarta.sml.extension.mime.StructuredMimeMessageWrapper;
 import com.audriga.jakarta.sml.TestUtils;
 import jakarta.mail.*;

From f32a1562ac13f648e61fbaad7256992b72e742a8 Mon Sep 17 00:00:00 2001
From: Joris Baum <joris@audriga.com>
Date: Wed, 16 Oct 2024 19:13:20 +0200
Subject: [PATCH 4/4] Fix typos/references in documentation

---
 README.md       | 2 +-
 docs/scanner.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2f61a51..e347639 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ public class Example {
 
 ### Further examples
 
-For more complete examples, see the [MailProcessingTest](test/com/audriga/jakarta/sml/test/MailProcessingTest.java) class, which demonstrates parsing and creating mails.
+For more complete examples, see the [MailProcessingTest](test/com/audriga/jakarta/sml/extension/MailProcessingTest.java) class, which demonstrates parsing and creating mails.
 
 ## Building
 
diff --git a/docs/scanner.md b/docs/scanner.md
index d35fc26..f402b1a 100644
--- a/docs/scanner.md
+++ b/docs/scanner.md
@@ -4,7 +4,7 @@ This is a command line tool for scanning an IMAP account.
 
 Its goal is to **find existing messages which contain Schema.org markup** (JSON-LD or Microdata) and to optionally dump the findings as JSON-LD.
 
-**Please consider donating test data** (in anonymized/pseudonomized form) to the [schema-org-examples dataset](https://github.com/audriga/schema-org-examples/).
+**Please consider donating test data** (in anonymized/pseudonymous form) to the [schema-org-examples dataset](https://github.com/audriga/schema-org-examples/).
 
 ## Building
 
@@ -41,7 +41,7 @@ See also additional config options below.
 
 ### Using with FastMail/Gmail/Microsoft accounts
 
-Some email providers, such as FastMail, Google, and Microsoft recommend OAuth as the default authentication mechnanism. Since this scanner currently does not support OAuth, you can alternatively set up a so-called "app-specific passwords" for those providers.
+Some email providers, such as FastMail, Google, and Microsoft recommend OAuth as the default authentication mechanism. Since this scanner currently does not support OAuth, you can alternatively set up a so-called "app-specific passwords" for those providers.
 
 Please see the corresponding provider documentation for details: