diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbca091..5b6fdb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ## Feature
 
 - Added `DelimiterVariableReplacer` with `{{` as prefix and `}}` as suffix by default
+- Export HtmlMailTemplates & HtmlMailTemplate
 
 ## CI
 
@@ -15,6 +16,7 @@
 ## Fix
 
 - Fixed the variable replacement in the email template.
+- imports
 
 ## Docs
 
diff --git a/bin/impaktfull_mailer_secrets.txt b/bin/impaktfull_mailer_secrets.txt
index f7be357..e8f05c5 100644
--- a/bin/impaktfull_mailer_secrets.txt
+++ b/bin/impaktfull_mailer_secrets.txt
@@ -1,5 +1,4 @@
-/// Change the extension to .dart 
-/// Update the brevoEmail & brevoPassword to use the example
+/// Change the extension to .dart
 class ImpaktfullMailerSecrets {
   ImpaktfullMailerSecrets._();
 
diff --git a/lib/impaktfull_mailer.dart b/lib/impaktfull_mailer.dart
index c4d77bd..9a497dc 100644
--- a/lib/impaktfull_mailer.dart
+++ b/lib/impaktfull_mailer.dart
@@ -7,6 +7,8 @@ export 'src/service/sender/noop_mail_sender_service.dart';
 
 // Templates
 export 'src/templates/mail_template.dart';
+export 'src/templates/html_mail_template.dart';
+export 'src/templates/html_mail_templates.dart';
 export 'src/templates/order_confirmation/order_confirmation_mail_template.dart';
 
 // Variable replacer
diff --git a/lib/src/service/sender/smtp_mail_sender_service.dart b/lib/src/service/sender/smtp_mail_sender_service.dart
index 2768216..b462214 100644
--- a/lib/src/service/sender/smtp_mail_sender_service.dart
+++ b/lib/src/service/sender/smtp_mail_sender_service.dart
@@ -1,4 +1,4 @@
-import 'package:impaktfull_mailer/impaktfull_mailer.dart';
+import 'package:impaktfull_mailer/src/service/sender/mail_sender_service.dart';
 import 'package:mailer/smtp_server.dart';
 
 abstract class SmtpMailSenderService extends MailSenderService {
diff --git a/lib/src/templates/html_mail_template.dart b/lib/src/templates/html_mail_template.dart
index f3903d4..726204f 100644
--- a/lib/src/templates/html_mail_template.dart
+++ b/lib/src/templates/html_mail_template.dart
@@ -1,5 +1,5 @@
-import 'package:impaktfull_mailer/impaktfull_mailer.dart';
 import 'package:impaktfull_mailer/src/templates/html_mail_templates.dart';
+import 'package:impaktfull_mailer/src/templates/mail_template.dart';
 
 abstract class HtmlMailTemplate extends MailTemplate {
   final String templateName;