From 551fa0d708a43b2e36587e39a55edb476f061b92 Mon Sep 17 00:00:00 2001
From: Chris Caron <lead2gold@gmail.com>
Date: Sun, 15 Dec 2024 13:02:18 -0500
Subject: [PATCH] Refactored apprise mailto:// and utils module (#1255)

---
 apprise/apprise.py                          |    7 +-
 apprise/apprise_attachment.py               |    2 +-
 apprise/apprise_config.py                   |    5 +-
 apprise/asset.py                            |    6 +
 apprise/attachment/base.py                  |    2 +-
 apprise/attachment/file.py                  |    2 +-
 apprise/cli.py                              |    3 +-
 apprise/config/base.py                      |    7 +-
 apprise/config/file.py                      |    2 +-
 apprise/decorators/base.py                  |    6 +-
 apprise/exception.py                        |    8 +
 apprise/manager.py                          |   14 +-
 apprise/persistent_store.py                 |    2 +-
 apprise/plugins/__init__.py                 |    5 +-
 apprise/plugins/africas_talking.py          |    6 +-
 apprise/plugins/apprise_api.py              |    3 +-
 apprise/plugins/aprs.py                     |    3 +-
 apprise/plugins/bark.py                     |    3 +-
 apprise/plugins/base.py                     |    2 +-
 apprise/plugins/bulksms.py                  |    4 +-
 apprise/plugins/bulkvs.py                   |    4 +-
 apprise/plugins/burstsms.py                 |    6 +-
 apprise/plugins/chantify.py                 |    2 +-
 apprise/plugins/clicksend.py                |    4 +-
 apprise/plugins/d7networks.py               |    6 +-
 apprise/plugins/dapnet.py                   |    6 +-
 apprise/plugins/dbus.py                     |    2 +-
 apprise/plugins/dingtalk.py                 |    3 +-
 apprise/plugins/discord.py                  |    3 +-
 apprise/plugins/email/__init__.py           |   53 +
 apprise/plugins/{email.py => email/base.py} | 1065 ++++++-------------
 apprise/plugins/email/common.py             |   84 ++
 apprise/plugins/email/templates.py          |  272 +++++
 apprise/plugins/emby.py                     |    2 +-
 apprise/plugins/fcm/__init__.py             |    6 +-
 apprise/plugins/fcm/color.py                |    2 +-
 apprise/plugins/feishu.py                   |    2 +-
 apprise/plugins/flock.py                    |    4 +-
 apprise/plugins/gnome.py                    |    2 +-
 apprise/plugins/google_chat.py              |    2 +-
 apprise/plugins/gotify.py                   |    2 +-
 apprise/plugins/growl.py                    |    2 +-
 apprise/plugins/home_assistant.py           |    2 +-
 apprise/plugins/httpsms.py                  |    4 +-
 apprise/plugins/ifttt.py                    |    3 +-
 apprise/plugins/join.py                     |    4 +-
 apprise/plugins/kavenegar.py                |    4 +-
 apprise/plugins/kumulos.py                  |    2 +-
 apprise/plugins/lametric.py                 |    4 +-
 apprise/plugins/line.py                     |    4 +-
 apprise/plugins/lunasea.py                  |    6 +-
 apprise/plugins/macosx.py                   |    2 +-
 apprise/plugins/mailgun.py                  |    6 +-
 apprise/plugins/mastodon.py                 |    4 +-
 apprise/plugins/matrix.py                   |    6 +-
 apprise/plugins/mattermost.py               |    4 +-
 apprise/plugins/messagebird.py              |    4 +-
 apprise/plugins/misskey.py                  |    2 +-
 apprise/plugins/mqtt.py                     |    3 +-
 apprise/plugins/msg91.py                    |    5 +-
 apprise/plugins/msteams.py                  |    6 +-
 apprise/plugins/nextcloud.py                |    2 +-
 apprise/plugins/nextcloudtalk.py            |    2 +-
 apprise/plugins/notica.py                   |    2 +-
 apprise/plugins/notifiarr.py                |    3 +-
 apprise/plugins/notifico.py                 |    3 +-
 apprise/plugins/ntfy.py                     |    7 +-
 apprise/plugins/office365.py                |    4 +-
 apprise/plugins/one_signal.py               |    8 +-
 apprise/plugins/opsgenie.py                 |    5 +-
 apprise/plugins/pagerduty.py                |    3 +-
 apprise/plugins/pagertree.py                |    3 +-
 apprise/plugins/parseplatform.py            |    2 +-
 apprise/plugins/plivo.py                    |    6 +-
 apprise/plugins/popcorn_notify.py           |    7 +-
 apprise/plugins/prowl.py                    |    2 +-
 apprise/plugins/pushbullet.py               |    4 +-
 apprise/plugins/pushdeer.py                 |    2 +-
 apprise/plugins/pushed.py                   |    3 +-
 apprise/plugins/pushjet.py                  |    2 +-
 apprise/plugins/pushme.py                   |    3 +-
 apprise/plugins/pushover.py                 |    3 +-
 apprise/plugins/pushsafer.py                |    3 +-
 apprise/plugins/pushy.py                    |    3 +-
 apprise/plugins/reddit.py                   |    4 +-
 apprise/plugins/revolt.py                   |    3 +-
 apprise/plugins/rocketchat.py               |    3 +-
 apprise/plugins/rsyslog.py                  |    2 +-
 apprise/plugins/ryver.py                    |    3 +-
 apprise/plugins/sendgrid.py                 |    4 +-
 apprise/plugins/serverchan.py               |    2 +-
 apprise/plugins/ses.py                      |    4 +-
 apprise/plugins/seven.py                    |    3 +-
 apprise/plugins/sfr.py                      |    3 +-
 apprise/plugins/signal_api.py               |    4 +-
 apprise/plugins/simplepush.py               |    2 +-
 apprise/plugins/sinch.py                    |    4 +-
 apprise/plugins/slack.py                    |    6 +-
 apprise/plugins/smseagle.py                 |    6 +-
 apprise/plugins/smsmanager.py               |    6 +-
 apprise/plugins/smtp2go.py                  |    6 +-
 apprise/plugins/sns.py                      |    4 +-
 apprise/plugins/sparkpost.py                |    6 +-
 apprise/plugins/splunk.py                   |    2 +-
 apprise/plugins/streamlabs.py               |    2 +-
 apprise/plugins/syslog.py                   |    2 +-
 apprise/plugins/techuluspush.py             |    2 +-
 apprise/plugins/telegram.py                 |    4 +-
 apprise/plugins/threema.py                  |    5 +-
 apprise/plugins/twilio.py                   |    4 +-
 apprise/plugins/twist.py                    |    3 +-
 apprise/plugins/twitter.py                  |    4 +-
 apprise/plugins/voipms.py                   |    4 +-
 apprise/plugins/vonage.py                   |    4 +-
 apprise/plugins/webexteams.py               |    2 +-
 apprise/plugins/wecombot.py                 |    2 +-
 apprise/plugins/whatsapp.py                 |    4 +-
 apprise/plugins/windows.py                  |    2 +-
 apprise/plugins/workflows.py                |    6 +-
 apprise/plugins/wxpusher.py                 |    3 +-
 apprise/plugins/xbmc.py                     |    2 +-
 apprise/plugins/zulip.py                    |   10 +-
 apprise/url.py                              |    7 +-
 apprise/utils/__init__.py                   |   27 +
 apprise/utils/base64.py                     |   88 ++
 apprise/utils/cwe312.py                     |  197 ++++
 apprise/utils/disk.py                       |  178 ++++
 apprise/utils/logic.py                      |  121 +++
 apprise/utils/module.py                     |   59 +
 apprise/{utils.py => utils/parse.py}        |  651 +-----------
 apprise/utils/pgp.py                        |  354 ++++++
 apprise/utils/singleton.py                  |   43 +
 apprise/utils/templates.py                  |   84 ++
 test/test_api.py                            |    2 +-
 test/test_apprise_utils.py                  |  897 ++++++++--------
 test/test_plugin_email.py                   |  242 +++--
 136 files changed, 2699 insertions(+), 2176 deletions(-)
 create mode 100644 apprise/plugins/email/__init__.py
 rename apprise/plugins/{email.py => email/base.py} (59%)
 create mode 100644 apprise/plugins/email/common.py
 create mode 100644 apprise/plugins/email/templates.py
 create mode 100644 apprise/utils/__init__.py
 create mode 100644 apprise/utils/base64.py
 create mode 100644 apprise/utils/cwe312.py
 create mode 100644 apprise/utils/disk.py
 create mode 100644 apprise/utils/logic.py
 create mode 100644 apprise/utils/module.py
 rename apprise/{utils.py => utils/parse.py} (68%)
 create mode 100644 apprise/utils/pgp.py
 create mode 100644 apprise/utils/singleton.py
 create mode 100644 apprise/utils/templates.py

diff --git a/apprise/apprise.py b/apprise/apprise.py
index 05a2ee3cc..16125009a 100644
--- a/apprise/apprise.py
+++ b/apprise/apprise.py
@@ -32,11 +32,10 @@
 from itertools import chain
 from . import common
 from .conversion import convert_between
-from .utils import is_exclusive_match
+from .utils.logic import is_exclusive_match
+from .utils.parse import parse_list, parse_urls
+from .utils.cwe312 import cwe312_url
 from .manager_plugins import NotificationManager
-from .utils import parse_list
-from .utils import parse_urls
-from .utils import cwe312_url
 from .emojis import apply_emojis
 from .logger import logger
 from .asset import AppriseAsset
diff --git a/apprise/apprise_attachment.py b/apprise/apprise_attachment.py
index ecf415ec9..7b491eef1 100644
--- a/apprise/apprise_attachment.py
+++ b/apprise/apprise_attachment.py
@@ -33,7 +33,7 @@
 from .logger import logger
 from .common import ContentLocation
 from .common import CONTENT_LOCATIONS
-from .utils import GET_SCHEMA_RE
+from .utils.parse import GET_SCHEMA_RE
 
 # Grant access to our Notification Manager Singleton
 A_MGR = AttachmentManager()
diff --git a/apprise/apprise_config.py b/apprise/apprise_config.py
index 080f70d30..c96b69f24 100644
--- a/apprise/apprise_config.py
+++ b/apprise/apprise_config.py
@@ -32,9 +32,8 @@
 from . import URLBase
 from .asset import AppriseAsset
 from . import common
-from .utils import GET_SCHEMA_RE
-from .utils import parse_list
-from .utils import is_exclusive_match
+from .utils.parse import GET_SCHEMA_RE, parse_list
+from .utils.logic import is_exclusive_match
 from .logger import logger
 
 # Grant access to our Configuration Manager Singleton
diff --git a/apprise/asset.py b/apprise/asset.py
index 2f08a6661..d952e9415 100644
--- a/apprise/asset.py
+++ b/apprise/asset.py
@@ -143,6 +143,12 @@ class AppriseAsset:
     # Defines the encoding of the content passed into Apprise
     encoding = 'utf-8'
 
+    # Automatically generate our Pretty Good Privacy (PGP) keys if one isn't
+    # present and our environment configuration allows for it.
+    # For example, a case where the environment wouldn't allow for it would be
+    # if Persistent Storage was set to `memory`
+    pgp_autogen = True
+
     # For more detail see CWE-312 @
     #    https://cwe.mitre.org/data/definitions/312.html
     #
diff --git a/apprise/attachment/base.py b/apprise/attachment/base.py
index ed938a984..b3743e036 100644
--- a/apprise/attachment/base.py
+++ b/apprise/attachment/base.py
@@ -32,7 +32,7 @@
 import base64
 from .. import exception
 from ..url import URLBase
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..common import ContentLocation
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/attachment/file.py b/apprise/attachment/file.py
index e23f5b6bb..f0aeb72b6 100644
--- a/apprise/attachment/file.py
+++ b/apprise/attachment/file.py
@@ -29,7 +29,7 @@
 import re
 import os
 from .base import AttachBase
-from ..utils import path_decode
+from ..utils.disk import path_decode
 from ..common import ContentLocation
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/cli.py b/apprise/cli.py
index 3c7f19365..4072a645b 100644
--- a/apprise/cli.py
+++ b/apprise/cli.py
@@ -43,7 +43,8 @@
 from . import AppriseConfig
 from . import PersistentStore
 
-from .utils import dir_size, bytes_to_str, parse_list, path_decode
+from .utils.parse import parse_list
+from .utils.disk import dir_size, bytes_to_str, path_decode
 from .common import NOTIFY_TYPES
 from .common import NOTIFY_FORMATS
 from .common import PERSISTENT_STORE_MODES
diff --git a/apprise/config/base.py b/apprise/config/base.py
index 953cee394..03a4423a9 100644
--- a/apprise/config/base.py
+++ b/apprise/config/base.py
@@ -35,11 +35,8 @@
 from .. import common
 from ..asset import AppriseAsset
 from ..url import URLBase
-from ..utils import GET_SCHEMA_RE
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import parse_urls
-from ..utils import cwe312_url
+from ..utils.parse import GET_SCHEMA_RE, parse_list, parse_bool, parse_urls
+from ..utils.cwe312 import cwe312_url
 from ..manager_config import ConfigurationManager
 from ..manager_plugins import NotificationManager
 
diff --git a/apprise/config/file.py b/apprise/config/file.py
index 9340f62bb..89224e2ea 100644
--- a/apprise/config/file.py
+++ b/apprise/config/file.py
@@ -29,7 +29,7 @@
 import re
 import os
 from .base import ConfigBase
-from ..utils import path_decode
+from ..utils.disk import path_decode
 from ..common import ConfigFormat
 from ..common import ContentIncludeMode
 from ..locale import gettext_lazy as _
diff --git a/apprise/decorators/base.py b/apprise/decorators/base.py
index 688fd96dc..e7cf7b666 100644
--- a/apprise/decorators/base.py
+++ b/apprise/decorators/base.py
@@ -29,10 +29,8 @@
 
 from ..plugins.base import NotifyBase
 from ..manager_plugins import NotificationManager
-from ..utils import URL_DETAILS_RE
-from ..utils import parse_url
-from ..utils import url_assembly
-from ..utils import dict_full_update
+from ..utils.parse import URL_DETAILS_RE, parse_url, url_assembly
+from ..utils.logic import dict_full_update
 from .. import common
 from ..logger import logger
 import inspect
diff --git a/apprise/exception.py b/apprise/exception.py
index 40967f5aa..a11f28248 100644
--- a/apprise/exception.py
+++ b/apprise/exception.py
@@ -37,6 +37,14 @@ def __init__(self, message, error_code=0):
         self.error_code = error_code
 
 
+class ApprisePluginException(AppriseException):
+    """
+    Class object for handling exceptions raised from within a plugin
+    """
+    def __init__(self, message, error_code=600):
+        super().__init__(message, error_code=error_code)
+
+
 class AppriseDiskIOError(AppriseException):
     """
     Thrown when an disk i/o error occurs
diff --git a/apprise/manager.py b/apprise/manager.py
index ab7f6c994..afc9c1a32 100644
--- a/apprise/manager.py
+++ b/apprise/manager.py
@@ -33,10 +33,10 @@
 import hashlib
 import inspect
 import threading
-from .utils import import_module
-from .utils import Singleton
-from .utils import parse_list
-from .utils import path_decode
+from .utils.module import import_module
+from .utils.singleton import Singleton
+from .utils.parse import parse_list
+from .utils.disk import path_decode
 from os.path import dirname
 from os.path import abspath
 from os.path import join
@@ -244,8 +244,10 @@ def load_modules(self, path=None, name=None, force=False):
                     for schema in schemas:
                         if schema in self._schema_map:
                             logger.error(
-                                "{} schema ({}) mismatch detected - {} to {}"
-                                .format(self.name, schema, self._schema_map,
+                                "{} schema ({}) mismatch detected -"
+                                ' {} already maps to {}'
+                                .format(self.name, schema,
+                                        self._schema_map[schema],
                                         plugin))
                             continue
 
diff --git a/apprise/persistent_store.py b/apprise/persistent_store.py
index ca7048517..6151beb5e 100644
--- a/apprise/persistent_store.py
+++ b/apprise/persistent_store.py
@@ -37,7 +37,7 @@
 import time
 import hashlib
 from .common import PersistentStoreMode, PERSISTENT_STORE_MODES
-from .utils import path_decode
+from .utils.disk import path_decode
 from .logger import logger
 
 # Used for writing/reading time stored in cache file
diff --git a/apprise/plugins/__init__.py b/apprise/plugins/__init__.py
index bfce14371..62ddeaa5f 100644
--- a/apprise/plugins/__init__.py
+++ b/apprise/plugins/__init__.py
@@ -36,9 +36,8 @@
 from ..common import NOTIFY_IMAGE_SIZES
 from ..common import NotifyType
 from ..common import NOTIFY_TYPES
-from ..utils import parse_list
-from ..utils import cwe312_url
-from ..utils import GET_SCHEMA_RE
+from ..utils.cwe312 import cwe312_url
+from ..utils.parse import parse_list, GET_SCHEMA_RE
 from ..logger import logger
 from ..locale import gettext_lazy as _
 from ..locale import LazyTranslation
diff --git a/apprise/plugins/africas_talking.py b/apprise/plugins/africas_talking.py
index af8a78577..98b2a208e 100644
--- a/apprise/plugins/africas_talking.py
+++ b/apprise/plugins/africas_talking.py
@@ -35,10 +35,8 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_bool
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import (
+    is_phone_no, parse_bool, parse_phone_no, validate_regex)
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/apprise_api.py b/apprise/plugins/apprise_api.py
index d6156438f..bd1177930 100644
--- a/apprise/plugins/apprise_api.py
+++ b/apprise/plugins/apprise_api.py
@@ -34,8 +34,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/aprs.py b/apprise/plugins/aprs.py
index d87025fee..d3c9dc1a2 100644
--- a/apprise/plugins/aprs.py
+++ b/apprise/plugins/aprs.py
@@ -74,8 +74,7 @@
 from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_call_sign
-from ..utils import parse_call_sign
+from ..utils.parse import is_call_sign, parse_call_sign
 from .. import __version__
 import re
 
diff --git a/apprise/plugins/bark.py b/apprise/plugins/bark.py
index c9f1fedef..0e415a290 100644
--- a/apprise/plugins/bark.py
+++ b/apprise/plugins/bark.py
@@ -36,8 +36,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import parse_list, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/base.py b/apprise/plugins/base.py
index 1c490defa..b7f774423 100644
--- a/apprise/plugins/base.py
+++ b/apprise/plugins/base.py
@@ -32,7 +32,7 @@
 
 from ..url import URLBase
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..common import NOTIFY_TYPES
 from ..common import NotifyFormat
 from ..common import NOTIFY_FORMATS
diff --git a/apprise/plugins/bulksms.py b/apprise/plugins/bulksms.py
index f53f61267..ce0daef49 100644
--- a/apprise/plugins/bulksms.py
+++ b/apprise/plugins/bulksms.py
@@ -39,9 +39,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/bulkvs.py b/apprise/plugins/bulkvs.py
index a02d8ab8c..14a1369ed 100644
--- a/apprise/plugins/bulkvs.py
+++ b/apprise/plugins/bulkvs.py
@@ -38,9 +38,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/burstsms.py b/apprise/plugins/burstsms.py
index 3b6f2669a..898f98641 100644
--- a/apprise/plugins/burstsms.py
+++ b/apprise/plugins/burstsms.py
@@ -36,10 +36,8 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/chantify.py b/apprise/plugins/chantify.py
index e7c5f63e9..e9be66161 100644
--- a/apprise/plugins/chantify.py
+++ b/apprise/plugins/chantify.py
@@ -37,7 +37,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/clicksend.py b/apprise/plugins/clicksend.py
index 7f28ac913..92a2405e0 100644
--- a/apprise/plugins/clicksend.py
+++ b/apprise/plugins/clicksend.py
@@ -45,9 +45,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/d7networks.py b/apprise/plugins/d7networks.py
index ff2e31b05..8b35458d5 100644
--- a/apprise/plugins/d7networks.py
+++ b/apprise/plugins/d7networks.py
@@ -41,10 +41,8 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
-from ..utils import parse_bool
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, validate_regex, parse_bool)
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/dapnet.py b/apprise/plugins/dapnet.py
index 725174c14..2d25759eb 100644
--- a/apprise/plugins/dapnet.py
+++ b/apprise/plugins/dapnet.py
@@ -55,10 +55,8 @@
 from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_call_sign
-from ..utils import parse_call_sign
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import (
+    is_call_sign, parse_call_sign, parse_list, parse_bool)
 
 
 class DapnetPriority:
diff --git a/apprise/plugins/dbus.py b/apprise/plugins/dbus.py
index 9a22a85f8..5d99c7e0e 100644
--- a/apprise/plugins/dbus.py
+++ b/apprise/plugins/dbus.py
@@ -30,7 +30,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 # Default our global support flag
diff --git a/apprise/plugins/dingtalk.py b/apprise/plugins/dingtalk.py
index e675f5302..2380d2e0a 100644
--- a/apprise/plugins/dingtalk.py
+++ b/apprise/plugins/dingtalk.py
@@ -38,8 +38,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 # Register at https://dingtalk.com
diff --git a/apprise/plugins/discord.py b/apprise/plugins/discord.py
index e41e22cdc..d2eb7541d 100644
--- a/apprise/plugins/discord.py
+++ b/apprise/plugins/discord.py
@@ -54,8 +54,7 @@
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
 
diff --git a/apprise/plugins/email/__init__.py b/apprise/plugins/email/__init__.py
new file mode 100644
index 000000000..31afabcab
--- /dev/null
+++ b/apprise/plugins/email/__init__.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+from email import charset
+
+from .base import NotifyEmail
+from .common import (
+    AppriseEmailException, EmailMessage, SecureMailMode, SECURE_MODES,
+    WebBaseLogin)
+from .templates import EMAIL_TEMPLATES
+
+# Globally Default encoding mode set to Quoted Printable.
+charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8')
+
+__all__ = [
+    # Reference
+    'NotifyEmail',
+
+    # Pretty Good Privacy
+    'ApprisePGPController', 'ApprisePGPException',
+
+    # Other
+    'AppriseEmailException', 'EmailMessage', 'SecureMailMode', 'SECURE_MODES',
+    'WebBaseLogin',
+
+    # Additional entries that may be useful to some developers
+    'EMAIL_TEMPLATES', 'PGP_SUPPORT',
+]
diff --git a/apprise/plugins/email.py b/apprise/plugins/email/base.py
similarity index 59%
rename from apprise/plugins/email.py
rename to apprise/plugins/email/base.py
index 8651c08a8..7f29fa26c 100644
--- a/apprise/plugins/email.py
+++ b/apprise/plugins/email/base.py
@@ -26,325 +26,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import dataclasses
-import os
 import re
 import smtplib
-import typing as t
 from email.mime.text import MIMEText
 from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
 from email.utils import formataddr, make_msgid
 from email.header import Header
-from email import charset
-import hashlib
 
 from socket import error as SocketError
 from datetime import datetime
-from datetime import timedelta
 from datetime import timezone
 
-from ..apprise_attachment import AppriseAttachment
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyFormat, NotifyType, PersistentStoreMode
-from ..conversion import convert_between
-from ..utils import is_ipaddr, is_email, parse_emails, is_hostname, parse_bool
-from ..locale import gettext_lazy as _
-
-try:
-    import pgpy
-    # Pretty Good Privacy (PGP) Support enabled
-    PGP_SUPPORT = True
-
-except ImportError:
-    # Pretty Good Privacy (PGP) Support disabled
-    PGP_SUPPORT = False
-
-# Globally Default encoding mode set to Quoted Printable.
-charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8')
-
-
-class WebBaseLogin:
-    """
-    This class is just used in conjunction of the default emailers
-    to best formulate a login to it using the data detected
-    """
-    # User Login must be Email Based
-    EMAIL = 'Email'
-
-    # User Login must UserID Based
-    USERID = 'UserID'
-
-
-# Secure Email Modes
-class SecureMailMode:
-    INSECURE = "insecure"
-    SSL = "ssl"
-    STARTTLS = "starttls"
-
-
-# Define all of the secure modes (used during validation)
-SECURE_MODES = {
-    SecureMailMode.STARTTLS: {
-        'default_port': 587,
-    },
-    SecureMailMode.SSL: {
-        'default_port': 465,
-    },
-    SecureMailMode.INSECURE: {
-        'default_port': 25,
-    },
-}
-
-# To attempt to make this script stupid proof, if we detect an email address
-# that is part of the this table, we can pre-use a lot more defaults if they
-# aren't otherwise specified on the users input.
-EMAIL_TEMPLATES = (
-    # Google GMail
-    (
-        'Google Mail',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>gmail\.com)$', re.I),
-        {
-            'port': 587,
-            'smtp_host': 'smtp.gmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Yandex
-    (
-        'Yandex',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>yandex\.(com|ru|ua|by|kz|uz|tr|fr))$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.yandex.ru',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.USERID, )
-        },
-    ),
-
-    # Microsoft Hotmail
-    (
-        'Microsoft Hotmail',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(hotmail|live)\.com(\.au)?)$', re.I),
-        {
-            'port': 587,
-            'smtp_host': 'smtp-mail.outlook.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Microsoft Outlook
-    (
-        'Microsoft Outlook',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(smtp\.)?outlook\.com(\.au)?)$', re.I),
-        {
-            'port': 587,
-            'smtp_host': 'smtp.outlook.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Microsoft Office 365 (Email Server)
-    # You must specify an authenticated sender address in the from= settings
-    # and a valid email in the to= to deliver your emails to
-    (
-        'Microsoft Office 365',
-        re.compile(
-            r'^[^@]+@(?P<domain>(smtp\.)?office365\.com)$', re.I),
-        {
-            'port': 587,
-            'smtp_host': 'smtp.office365.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-        },
-    ),
-
-    # Yahoo Mail
-    (
-        'Yahoo Mail',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>yahoo\.(ca|com))$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.mail.yahoo.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Fast Mail (Series 1)
-    (
-        'Fast Mail',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>fastmail\.(com|cn|co\.uk|com\.au|de|es|fm|fr|im|'
-            r'in|jp|mx|net|nl|org|se|to|tw|uk|us))$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.fastmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Fast Mail (Series 2)
-    (
-        'Fast Mail Extended Addresses',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>123mail\.org|airpost\.net|eml\.cc|fmail\.co\.uk|'
-            r'fmgirl\.com|fmguy\.com|mailbolt\.com|mailcan\.com|'
-            r'mailhaven\.com|mailmight\.com|ml1\.net|mm\.st|myfastmail\.com|'
-            r'proinbox\.com|promessage\.com|rushpost\.com|sent\.(as|at|com)|'
-            r'speedymail\.org|warpmail\.net|xsmail\.com|150mail\.com|'
-            r'150ml\.com|16mail\.com|2-mail\.com|4email\.net|50mail\.com|'
-            r'allmail\.net|bestmail\.us|cluemail\.com|elitemail\.org|'
-            r'emailcorner\.net|emailengine\.(net|org)|emailgroups\.net|'
-            r'emailplus\.org|emailuser\.net|f-m\.fm|fast-email\.com|'
-            r'fast-mail\.org|fastem\.com|fastemail\.us|fastemailer\.com|'
-            r'fastest\.cc|fastimap\.com|fastmailbox\.net|fastmessaging\.com|'
-            r'fea\.st|fmailbox\.com|ftml\.net|h-mail\.us|hailmail\.net|'
-            r'imap-mail\.com|imap\.cc|imapmail\.org|inoutbox\.com|'
-            r'internet-e-mail\.com|internet-mail\.org|internetemails\.net|'
-            r'internetmailing\.net|jetemail\.net|justemail\.net|'
-            r'letterboxes\.org|mail-central\.com|mail-page\.com|'
-            r'mailandftp\.com|mailas\.com|mailc\.net|mailforce\.net|'
-            r'mailftp\.com|mailingaddress\.org|mailite\.com|mailnew\.com|'
-            r'mailsent\.net|mailservice\.ms|mailup\.net|mailworks\.org|'
-            r'mymacmail\.com|nospammail\.net|ownmail\.net|petml\.com|'
-            r'postinbox\.com|postpro\.net|realemail\.net|reallyfast\.biz|'
-            r'reallyfast\.info|speedpost\.net|ssl-mail\.com|swift-mail\.com|'
-            r'the-fastest\.net|the-quickest\.com|theinternetemail\.com|'
-            r'veryfast\.biz|veryspeedy\.net|yepmail\.net)$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.fastmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Zoho Mail (Free)
-    (
-        'Zoho Mail',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>zoho(mail)?\.com)$', re.I),
-        {
-            'port': 587,
-            'smtp_host': 'smtp.zoho.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # SendGrid (Email Server)
-    # You must specify an authenticated sender address in the from= settings
-    # and a valid email in the to= to deliver your emails to
-    (
-        'SendGrid',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(\.smtp)?sendgrid\.(com|net))$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.sendgrid.net',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.USERID, )
-        },
-    ),
-
-    # 163.com
-    (
-        '163.com',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>163\.com)$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.163.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Foxmail.com
-    (
-        'Foxmail.com',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(foxmail|qq)\.com)$', re.I),
-        {
-            'port': 587,
-            'smtp_host': 'smtp.qq.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Comcast.net
-    (
-        'Comcast.net',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(comcast)\.net)$', re.I),
-        {
-            'port': 465,
-            'smtp_host': 'smtp.comcast.net',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
-        },
-    ),
-
-    # Catch All
-    (
-        'Custom',
-        re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>.+)$', re.I),
-        {
-            # Setting smtp_host to None is a way of
-            # auto-detecting it based on other parameters
-            # specified.  There is no reason to ever modify
-            # this Catch All
-            'smtp_host': None,
-        },
-    ),
-)
-
-
-@dataclasses.dataclass
-class EmailMessage:
-    recipient: str
-    to_addrs: t.List[str]
-    body: str
+from ..base import NotifyBase
+from ...url import PrivacyMode
+from ...common import NotifyFormat, NotifyType
+from ...conversion import convert_between
+from ...utils import pgp as _pgp
+from ...utils.parse import (
+    is_ipaddr, is_email, parse_emails, is_hostname, parse_bool)
+from ...locale import gettext_lazy as _
+from ...logger import logger
+from .common import (
+    AppriseEmailException, EmailMessage, SecureMailMode, SECURE_MODES,
+    WebBaseLogin)
+from . import templates
 
 
 class NotifyEmail(NotifyBase):
@@ -368,10 +75,6 @@ class NotifyEmail(NotifyBase):
     # Support attachments
     attachment_support = True
 
-    # There is no reason a PGP Public Key should exceed 8K in size
-    # If it is more than this, then it is not accepted
-    max_pgp_public_key_size = 8000
-
     # Default Notify Format
     notify_format = NotifyFormat.HTML
 
@@ -456,12 +159,6 @@ class NotifyEmail(NotifyBase):
             'type': 'string',
             'map_to': 'smtp_host',
         },
-        'pgp': {
-            'name': _('PGP Encryption'),
-            'type': 'bool',
-            'map_to': 'use_pgp',
-            'default': False,
-        },
         'mode': {
             'name': _('Secure Mode'),
             'type': 'choice:string',
@@ -474,6 +171,12 @@ class NotifyEmail(NotifyBase):
             'type': 'list:string',
             'map_to': 'reply_to',
         },
+        'pgp': {
+            'name': _('PGP Encryption'),
+            'type': 'bool',
+            'map_to': 'use_pgp',
+            'default': False,
+        },
         'pgpkey': {
             'name': _('PGP Public Key Path'),
             'type': 'string',
@@ -531,29 +234,6 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         self.smtp_host = \
             smtp_host if isinstance(smtp_host, str) else ''
 
-        # pgp hash
-        self.pgp_public_keys = {}
-
-        self.use_pgp = use_pgp if not None \
-            else self.template_args['pgp']['default']
-
-        if self.use_pgp and not PGP_SUPPORT:
-            self.logger.warning(
-                'PGP Support is not available on this installation; '
-                'ask admin to install PGPy')
-
-        # Our template object is just an AppriseAttachment object
-        if pgp_key:
-            self.pgp_key = AppriseAttachment(asset=self.asset)
-            # Add our definition to our pgp_key reference
-            self.pgp_key.add(pgp_key)
-            # Enforce maximum file size
-            self.pgp_key[0].max_file_size = self.max_pgp_public_key_size
-
-        else:
-            # No key; use auto-generation
-            self.pgp_key = None
-
         # Now detect secure mode
         if secure_mode:
             self.secure_mode = None \
@@ -618,7 +298,7 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
             )
 
         # Apply any defaults based on certain known configurations
-        self.NotifyEmailDefaults(secure_mode=secure_mode, **kwargs)
+        self.apply_email_defaults(secure_mode=secure_mode, **kwargs)
 
         if self.user:
             if self.host:
@@ -689,9 +369,25 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         if not self.smtp_host:
             self.smtp_host = self.host
 
+        # Prepare our Pretty Good Privacy Object
+        self.pgp = _pgp.ApprisePGPController(
+            path=self.store.path, pub_keyfile=pgp_key,
+            email=self.from_addr[1], asset=self.asset)
+
+        # We store so we can generate a URL later on
+        self.pgp_key = pgp_key
+
+        self.use_pgp = use_pgp if not None \
+            else self.template_args['pgp']['default']
+
+        if self.use_pgp and not _pgp.PGP_SUPPORT:
+            self.logger.warning(
+                'PGP Support is not available on this installation; '
+                'ask admin to install PGPy')
+
         return
 
-    def NotifyEmailDefaults(self, secure_mode=None, port=None, **kwargs):
+    def apply_email_defaults(self, secure_mode=None, port=None, **kwargs):
         """
         A function that prefills defaults based on the email
         it was provided.
@@ -710,39 +406,40 @@ def NotifyEmailDefaults(self, secure_mode=None, port=None, **kwargs):
             self.host,
         )
 
-        for i in range(len(EMAIL_TEMPLATES)):  # pragma: no branch
+        for i in range(len(templates.EMAIL_TEMPLATES)):  # pragma: no branch
             self.logger.trace('Scanning %s against %s' % (
-                from_addr, EMAIL_TEMPLATES[i][0]
+                from_addr, templates.EMAIL_TEMPLATES[i][0]
             ))
-            match = EMAIL_TEMPLATES[i][1].match(from_addr)
+            match = templates.EMAIL_TEMPLATES[i][1].match(from_addr)
             if match:
                 self.logger.info(
                     'Applying %s Defaults' %
-                    EMAIL_TEMPLATES[i][0],
+                    templates.EMAIL_TEMPLATES[i][0],
                 )
                 # the secure flag can not be altered if defined in the template
-                self.secure = EMAIL_TEMPLATES[i][2]\
+                self.secure = templates.EMAIL_TEMPLATES[i][2]\
                     .get('secure', self.secure)
 
                 # The SMTP Host check is already done above; if it was
                 # specified we wouldn't even reach this part of the code.
-                self.smtp_host = EMAIL_TEMPLATES[i][2]\
+                self.smtp_host = templates.EMAIL_TEMPLATES[i][2]\
                     .get('smtp_host', self.smtp_host)
 
                 # The following can be over-ridden if defined manually in the
                 # Apprise URL.  Otherwise they take on the template value
                 if not port:
-                    self.port = EMAIL_TEMPLATES[i][2]\
+                    self.port = templates.EMAIL_TEMPLATES[i][2]\
                         .get('port', self.port)
                 if not secure_mode:
-                    self.secure_mode = EMAIL_TEMPLATES[i][2]\
+                    self.secure_mode = templates.EMAIL_TEMPLATES[i][2]\
                         .get('secure_mode', self.secure_mode)
 
                 # Adjust email login based on the defined usertype. If no entry
                 # was specified, then we default to having them all set (which
                 # basically implies that there are no restrictions and use use
                 # whatever was specified)
-                login_type = EMAIL_TEMPLATES[i][2].get('login_type', [])
+                login_type = \
+                    templates.EMAIL_TEMPLATES[i][2].get('login_type', [])
                 if login_type:
                     # only apply additional logic to our user if a login_type
                     # was specified.
@@ -763,195 +460,14 @@ def NotifyEmailDefaults(self, secure_mode=None, port=None, **kwargs):
 
                 break
 
-    def _get_charset(self, input_string):
-        """
-        Get utf-8 charset if non ascii string only
-
-        Encode an ascii string to utf-8 is bad for email deliverability
-        because some anti-spam gives a bad score for that
-        like SUBJ_EXCESS_QP flag on Rspamd
-        """
-        if not input_string:
-            return None
-        return 'utf-8' if not all(ord(c) < 128 for c in input_string) else None
-
     def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
              **kwargs):
-        """
-        Perform Email Notification
-        """
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning(
-                'There are no Email recipients to notify')
+            logger.warning('There are no Email recipients to notify')
             return False
 
-        elif self.use_pgp and not PGP_SUPPORT:
-            self.logger.warning('PGP Support unavailable')
-            return False
-
-        messages: t.List[EmailMessage] = []
-
-        # Create a copy of the targets list
-        emails = list(self.targets)
-        while len(emails):
-            # Get our email to notify
-            to_name, to_addr = emails.pop(0)
-
-            # Strip target out of cc list if in To or Bcc
-            cc = (self.cc - self.bcc - set([to_addr]))
-
-            # Strip target out of bcc list if in To
-            bcc = (self.bcc - set([to_addr]))
-
-            # Strip target out of reply_to list if in To
-            reply_to = (self.reply_to - set([to_addr]))
-
-            # Format our cc addresses to support the Name field
-            cc = [formataddr(
-                (self.names.get(addr, False), addr), charset='utf-8')
-                for addr in cc]
-
-            # Format our bcc addresses to support the Name field
-            bcc = [formataddr(
-                (self.names.get(addr, False), addr), charset='utf-8')
-                for addr in bcc]
-
-            if reply_to:
-                # Format our reply-to addresses to support the Name field
-                reply_to = [formataddr(
-                    (self.names.get(addr, False), addr), charset='utf-8')
-                    for addr in reply_to]
-
-            self.logger.debug(
-                'Email From: {}'.format(
-                    formataddr(self.from_addr, charset='utf-8')))
-
-            self.logger.debug('Email To: {}'.format(to_addr))
-            if cc:
-                self.logger.debug('Email Cc: {}'.format(', '.join(cc)))
-            if bcc:
-                self.logger.debug('Email Bcc: {}'.format(', '.join(bcc)))
-            if reply_to:
-                self.logger.debug(
-                    'Email Reply-To: {}'.format(', '.join(reply_to))
-                )
-            self.logger.debug('Login ID: {}'.format(self.user))
-            self.logger.debug(
-                'Delivery: {}:{}'.format(self.smtp_host, self.port))
-
-            # Prepare Email Message
-            if self.notify_format == NotifyFormat.HTML:
-                base = MIMEMultipart("alternative")
-                base.attach(MIMEText(
-                    convert_between(
-                        NotifyFormat.HTML, NotifyFormat.TEXT, body),
-                    'plain', 'utf-8')
-                )
-                base.attach(MIMEText(body, 'html', 'utf-8'))
-            else:
-                base = MIMEText(body, 'plain', 'utf-8')
-
-            if attach and self.attachment_support:
-                mixed = MIMEMultipart("mixed")
-                mixed.attach(base)
-                # Now store our attachments
-                for no, attachment in enumerate(attach, start=1):
-                    if not attachment:
-                        # We could not load the attachment; take an early
-                        # exit since this isn't what the end user wanted
-
-                        # We could not access the attachment
-                        self.logger.error(
-                            'Could not access attachment {}.'.format(
-                                attachment.url(privacy=True)))
-
-                        return False
-
-                    self.logger.debug(
-                        'Preparing Email attachment {}'.format(
-                            attachment.url(privacy=True)))
-
-                    with open(attachment.path, "rb") as abody:
-                        app = MIMEApplication(abody.read())
-                        app.set_type(attachment.mimetype)
-
-                        # Prepare our attachment name
-                        filename = attachment.name \
-                            if attachment.name else f'file{no:03}.dat'
-
-                        app.add_header(
-                            'Content-Disposition',
-                            'attachment; filename="{}"'.format(
-                                Header(filename, 'utf-8')),
-                        )
-                        mixed.attach(app)
-                base = mixed
-
-            if self.use_pgp:
-                self.logger.debug("Securing email with PGP Encryption")
-                # Set our header information to include in the encryption
-                base['From'] = formataddr(
-                    (None, self.from_addr[1]), charset='utf-8')
-                base['To'] = formataddr((None, to_addr), charset='utf-8')
-                base['Subject'] = Header(title, self._get_charset(title))
-
-                # Apply our encryption
-                encrypted_content = self.pgp_encrypt_message(base.as_string())
-                if not encrypted_content:
-                    self.logger.warning('Unable to PGP encrypt email')
-                    # Unable to send notification
-                    return False
-
-                # prepare our messsage
-                base = MIMEMultipart(
-                    "encrypted", protocol="application/pgp-encrypted")
-
-                # Store Autocrypt header (DeltaChat Support)
-                base.add_header(
-                    "Autocrypt",
-                    "addr=%s; prefer-encrypt=mutual" % formataddr(
-                        (False, to_addr), charset='utf-8'))
-
-                # Set Encryption Info Part
-                enc_payload = MIMEText("Version: 1", "plain")
-                enc_payload.set_type("application/pgp-encrypted")
-                base.attach(enc_payload)
-
-                enc_payload = MIMEBase("application", "octet-stream")
-                enc_payload.set_payload(encrypted_content)
-                base.attach(enc_payload)
-
-            # Apply any provided custom headers
-            for k, v in self.headers.items():
-                base[k] = Header(v, self._get_charset(v))
-
-            base['Subject'] = Header(title, self._get_charset(title))
-            base['From'] = formataddr(self.from_addr, charset='utf-8')
-            base['To'] = formataddr((to_name, to_addr), charset='utf-8')
-            base['Message-ID'] = make_msgid(domain=self.smtp_host)
-            base['Date'] = \
-                datetime.now(timezone.utc)\
-                .strftime("%a, %d %b %Y %H:%M:%S +0000")
-            base['X-Application'] = self.app_id
-
-            if cc:
-                base['Cc'] = ','.join(cc)
-
-            if reply_to:
-                base['Reply-To'] = ','.join(reply_to)
-
-            message = EmailMessage(
-                recipient=to_addr,
-                to_addrs=[to_addr] + list(cc) + list(bcc),
-                body=base.as_string())
-            messages.append(message)
-
-        return self.submit(messages)
-
-    def submit(self, messages: t.List[EmailMessage]):
-
         # error tracking (used for function return)
         has_error = False
 
@@ -980,13 +496,27 @@ def submit(self, messages: t.List[EmailMessage]):
                 self.logger.debug('Securing connection with STARTTLS...')
                 socket.starttls()
 
+            self.logger.trace('Login ID: {}'.format(self.user))
             if self.user and self.password:
                 # Apply Login credetials
                 self.logger.debug('Applying user credentials...')
                 socket.login(self.user, self.password)
 
-            # Send the emails
-            for message in messages:
+            # Prepare our headers
+            headers = {
+                'X-Application': self.app_id,
+            }
+            headers.update(self.headers)
+
+            # Iterate over our email messages we can generate and then
+            # send them off.
+            for message in NotifyEmail.prepare_emails(
+                    subject=title, body=body, notify_format=self.notify_format,
+                    from_addr=self.from_addr, to=self.targets,
+                    cc=self.cc, bcc=self.bcc, reply_to=self.reply_to,
+                    smtp_host=self.smtp_host,
+                    attach=attach, headers=headers, names=self.names,
+                    pgp=self.pgp if self.use_pgp else None):
                 try:
                     socket.sendmail(
                         self.from_addr[1],
@@ -1012,236 +542,22 @@ def submit(self, messages: t.List[EmailMessage]):
             # Mark as failure
             has_error = True
 
+        except AppriseEmailException as e:
+            self.logger.debug(f'Socket Exception: {e}')
+
+            # Mark as failure
+            has_error = True
+
         finally:
             # Gracefully terminate the connection with the server
             if socket is not None:
                 socket.quit()
 
         # Reduce our dictionary (eliminate expired keys if any)
-        self.pgp_public_keys = {
-            key: value for key, value in self.pgp_public_keys.items()
-            if value['expires'] > datetime.now(timezone.utc)}
+        self.pgp.prune()
 
         return not has_error
 
-    def pgp_generate_keys(self, path=None):
-        """
-        Generates a set of keys based on email configured
-        """
-        if path is None:
-            if self.store.mode == PersistentStoreMode.MEMORY:
-                # Not possible - no write permissions
-                return False
-
-            # Set our path
-            path = self.store.path
-
-        try:
-            # Create a new RSA key pair with 2048-bit strength
-            key = pgpy.PGPKey.new(
-                pgpy.constants.PubKeyAlgorithm.RSAEncryptOrSign, 2048)
-
-        except NameError:
-            # PGPy not installed
-            self.logger.debug('PGPy not installed; ignoring PGP file: %s')
-            return False
-
-        # Prepare our uid
-        name, email = self.names[self.from_addr[1]], self.from_addr[1]
-        uid = pgpy.PGPUID.new(name, email=email)
-
-        # Filenames
-        file_prefix = email.split('@')[0].lower()
-        pub_path = os.path.join(path, f'{file_prefix}-pub.asc')
-        prv_path = os.path.join(path, f'{file_prefix}-prv.asc')
-
-        if os.path.isfile(pub_path):
-            self.logger.warning(
-                'PGP generation aborted; Public key already exists: %s',
-                pub_path)
-            return True
-
-        # Add the user ID to the key
-        key.add_uid(uid, usage={
-            pgpy.constants.KeyFlags.Sign,
-            pgpy.constants.KeyFlags.EncryptCommunications},
-            hashes=[pgpy.constants.HashAlgorithm.SHA256],
-            ciphers=[pgpy.constants.SymmetricKeyAlgorithm.AES256],
-            compression=[pgpy.constants.CompressionAlgorithm.ZLIB])
-
-        try:
-            # Write our keys to disk
-            with open(pub_path, 'w') as f:
-                f.write(str(key.pubkey))
-
-        except OSError as e:
-            self.logger.warning('Error writing PGP file %s', pub_path)
-            self.logger.debug(f'I/O Exception: {e}')
-
-            # Cleanup
-            try:
-                os.unlink(pub_path)
-                self.logger.trace('Removed %s', pub_path)
-
-            except OSError:
-                pass
-
-        try:
-
-            with open(prv_path, 'w') as f:
-                f.write(str(key))
-
-        except OSError as e:
-            self.logger.warning('Error writing PGP file %s', prv_path)
-            self.logger.debug(f'I/O Exception: {e}')
-            try:
-                os.unlink(pub_path)
-                self.logger.trace('Removed %s', pub_path)
-
-            except OSError:
-                pass
-
-            try:
-                os.unlink(prv_path)
-                self.logger.trace('Removed %s', prv_path)
-
-            except OSError:
-                pass
-
-            return False
-
-        self.logger.info(
-            'Wrote PGP Keys for %s/%s',
-            os.path.dirname(pub_path),
-            os.path.basename(pub_path))
-        return True
-
-    def pgp_pubkey(self, email=None):
-        """
-        Returns a list of filenames worth scanning for
-        """
-        if self.pgp_key is not None:
-            # If our code reaches here, then we fetch our public key
-            pgp_key = self.pgp_key[0]
-            if not pgp_key:
-                # We could not access the attachment
-                self.logger.error(
-                    'Could not access PGP Public Key {}.'.format(
-                        pgp_key.url(privacy=True)))
-                return False
-
-            return pgp_key.path
-
-        elif not self.store.path:
-            # No path
-            return None
-
-        fnames = [
-            'pgp-public.asc',
-            'pgp-pub.asc',
-            'public.asc',
-            'pub.asc',
-        ]
-
-        # Prepare our key files
-        emails = [self.from_addr[1]]
-        if email:
-            emails.append(email)
-
-        for email in emails:
-            _entry = email.split('@')[0].lower()
-            fnames.insert(0, f'{_entry}-pub.asc')
-
-            # Lowercase email (Highest Priority)
-            _entry = email.lower()
-            fnames.insert(0, f'{_entry}-pub.asc')
-
-        return next(
-            (os.path.join(self.store.path, fname)
-             for fname in fnames
-             if os.path.isfile(os.path.join(self.store.path, fname))),
-            None)
-
-    def pgp_public_key(self, path=None, email=None):
-        """
-        Opens a spcified pgp public file and returns the key from it which
-        is used to encrypt the message
-        """
-        if path is None:
-            path = self.pgp_pubkey(email=email)
-
-            if not path:
-                if self.pgp_generate_keys(path=self.store.path):
-                    path = self.pgp_pubkey(email=email)
-                    if path:
-                        # We should get a hit now
-                        return self.pgp_public_key(path=path)
-
-                self.logger.warning('No PGP Public Key could be loaded')
-                return None
-
-        # Persistent storage key
-        ps_key = hashlib.sha1(
-            os.path.abspath(path).encode('utf-8')).hexdigest()
-        if ps_key in self.pgp_public_keys:
-            # Take an early exit
-            return self.pgp_public_keys[ps_key]['public_key']
-
-        try:
-            with open(path, 'r') as key_file:
-                public_key, _ = pgpy.PGPKey.from_blob(key_file.read())
-
-        except NameError:
-            # PGPy not installed
-            self.logger.debug(
-                'PGPy not installed; skipping PGP support: %s', path)
-            return None
-
-        except FileNotFoundError:
-            # Generate keys
-            self.logger.debug('PGP Public Key file not found: %s', path)
-            return None
-
-        except OSError as e:
-            self.logger.warning('Error accessing PGP Public Key file %s', path)
-            self.logger.debug(f'I/O Exception: {e}')
-            return None
-
-        self.pgp_public_keys[ps_key] = {
-            'public_key': public_key,
-            'expires':
-            datetime.now(timezone.utc) + timedelta(seconds=86400)
-        }
-        return public_key
-
-    # Encrypt message using the recipient's public key
-    def pgp_encrypt_message(self, message, path=None):
-        """
-        If provided a path to a pgp-key, content is encrypted
-        """
-
-        # Acquire our key
-        public_key = self.pgp_public_key(path=path)
-        if not public_key:
-            # Encryption not possible
-            return False
-
-        try:
-            message_object = pgpy.PGPMessage.new(message)
-            encrypted_message = public_key.encrypt(message_object)
-            return str(encrypted_message)
-
-        except pgpy.errors.PGPError:
-            # Encryption not Possible
-            self.logger.debug(
-                'PGP Public Key Corruption; encryption not possible')
-
-        except NameError:
-            # PGPy not installed
-            self.logger.debug('PGPy not installed; Skipping PGP encryption')
-
-        return None
-
     def url(self, privacy=False, *args, **kwargs):
         """
         Returns the URL built dynamically based on specified arguments.
@@ -1252,10 +568,9 @@ def url(self, privacy=False, *args, **kwargs):
             'pgp': 'yes' if self.use_pgp else 'no',
         }
 
-        # Store oure public key back into your URL
+        # Store our public key back into your URL
         if self.pgp_key is not None:
-            params['pgp_key'] = NotifyEmail.quote(
-                self.pgp_key[0].url(privacy=privacy), safe=':')
+            params['pgp_key'] = NotifyEmail.quote(self.pgp_key, safe=':\\/')
 
         # Append our headers into our parameters
         params.update({'+{}'.format(k): v for k, v in self.headers.items()})
@@ -1288,7 +603,7 @@ def url(self, privacy=False, *args, **kwargs):
             params['from'] = \
                 formataddr((False, self.from_addr[1]), charset='utf-8')
 
-        if len(self.cc) > 0:
+        if self.cc:
             # Handle our Carbon Copy Addresses
             params['cc'] = ','.join([
                 formataddr(
@@ -1298,7 +613,7 @@ def url(self, privacy=False, *args, **kwargs):
                     charset='utf-8').replace(',', '%2C')
                 for e in self.cc])
 
-        if len(self.bcc) > 0:
+        if self.bcc:
             # Handle our Blind Carbon Copy Addresses
             params['bcc'] = ','.join([
                 formataddr(
@@ -1477,3 +792,233 @@ def parse_url(url):
                               for x, y in results['qsd+'].items()}
 
         return results
+
+    @staticmethod
+    def _get_charset(input_string):
+        """
+        Get utf-8 charset if non ascii string only
+
+        Encode an ascii string to utf-8 is bad for email deliverability
+        because some anti-spam gives a bad score for that
+        like SUBJ_EXCESS_QP flag on Rspamd
+        """
+        if not input_string:
+            return None
+        return 'utf-8' if not all(ord(c) < 128 for c in input_string) else None
+
+    @staticmethod
+    def prepare_emails(subject, body, from_addr, to,
+                       cc=set(), bcc=set(), reply_to=set(),
+                       # Providing an SMTP Host helps improve Email Message-ID
+                       # and avoids getting flagged as spam
+                       smtp_host=None,
+                       # Can be either 'html' or 'text'
+                       notify_format=NotifyFormat.HTML,
+                       attach=None, headers=dict(),
+                       # Names can be a dictionary
+                       names=None,
+                       # Pretty Good Privacy Support; Pass in an
+                       # ApprisePGPController if you wish to use it
+                       pgp=None):
+        """
+        Generator for emails
+            from_addr: must be in format: (from_name, from_addr)
+            to: must be in the format:
+                 [(to_name, to_addr), (to_name, to_addr)), ...]
+            cc: must be a set of email addresses
+            bcc: must be a set of email addresses
+            reply_to: must be either None, or an email address
+            smtp_host: This is used to generate the email's Message-ID. Set
+                       this correctly to avoid getting flagged as Spam
+            notify_format: can be either 'text' or 'html'
+            attach: must be of class AppriseAttachment
+            headers: Optionally provide a dictionary of additional headers you
+                     would like to include in the email payload
+            names: This is a dictionary of email addresses as keys and the
+                   Names to associate with them when sending the email.
+                   This is cross referenced for the cc and bcc lists
+            pgp:   Encrypting the message using Pretty Good Privacy support
+                   This requires that the pgp_path provided exists and
+                   keys can be referenced here to perform the encryption
+                   with. If a key isn't found, one will be generated.
+
+                   pgp support requires the 'PGPy' Python library to be
+                   available.
+
+                   Pass in an ApprisePGPController() if you wish to use this
+        """
+
+        if not to:
+            # There is no one to email; we're done
+            msg = 'There are no Email recipients to notify'
+            logger.warning(msg)
+            raise AppriseEmailException(msg)
+
+        elif pgp and not _pgp.PGP_SUPPORT:
+            msg = 'PGP Support unavailable; install PGPy library'
+            logger.warning(msg)
+            raise AppriseEmailException(msg)
+
+        if not names:
+            # Prepare a empty dictionary to prevent errors/warnings
+            names = {}
+
+        if not smtp_host:
+            # Generate a host identifier (used for Message-ID Creation)
+            smtp_host = from_addr[1].split('@')[1]
+
+        logger.debug('SMTP Host: {smtp_host}')
+
+        # Create a copy of the targets list
+        emails = list(to)
+        while len(emails):
+            # Get our email to notify
+            to_name, to_addr = emails.pop(0)
+
+            # Strip target out of cc list if in To or Bcc
+            _cc = (cc - bcc - set([to_addr]))
+
+            # Strip target out of bcc list if in To
+            _bcc = (bcc - set([to_addr]))
+
+            # Strip target out of reply_to list if in To
+            _reply_to = (reply_to - set([to_addr]))
+
+            # Format our cc addresses to support the Name field
+            _cc = [formataddr(
+                (names.get(addr, False), addr), charset='utf-8')
+                for addr in _cc]
+
+            # Format our bcc addresses to support the Name field
+            _bcc = [formataddr(
+                (names.get(addr, False), addr), charset='utf-8')
+                for addr in _bcc]
+
+            if reply_to:
+                # Format our reply-to addresses to support the Name field
+                reply_to = [formataddr(
+                    (names.get(addr, False), addr), charset='utf-8')
+                    for addr in reply_to]
+
+            logger.debug(
+                'Email From: {}'.format(
+                    formataddr(from_addr, charset='utf-8')))
+
+            logger.debug('Email To: {}'.format(to_addr))
+            if _cc:
+                logger.debug('Email Cc: {}'.format(', '.join(_cc)))
+            if _bcc:
+                logger.debug('Email Bcc: {}'.format(', '.join(_bcc)))
+            if _reply_to:
+                logger.debug(
+                    'Email Reply-To: {}'.format(', '.join(_reply_to))
+                )
+
+            # Prepare Email Message
+            if notify_format == NotifyFormat.HTML:
+                base = MIMEMultipart("alternative")
+                base.attach(MIMEText(
+                    convert_between(
+                        NotifyFormat.HTML, NotifyFormat.TEXT, body),
+                    'plain', 'utf-8')
+                )
+                base.attach(MIMEText(body, 'html', 'utf-8'))
+            else:
+                base = MIMEText(body, 'plain', 'utf-8')
+
+            if attach:
+                mixed = MIMEMultipart("mixed")
+                mixed.attach(base)
+                # Now store our attachments
+                for no, attachment in enumerate(attach, start=1):
+                    if not attachment:
+                        # We could not load the attachment; take an early
+                        # exit since this isn't what the end user wanted
+
+                        # We could not access the attachment
+                        msg = 'Could not access attachment {}.'.format(
+                            attachment.url(privacy=True))
+                        logger.warning(msg)
+                        raise AppriseEmailException(msg)
+
+                    logger.debug(
+                        'Preparing Email attachment {}'.format(
+                            attachment.url(privacy=True)))
+
+                    with open(attachment.path, "rb") as abody:
+                        app = MIMEApplication(abody.read())
+                        app.set_type(attachment.mimetype)
+
+                        # Prepare our attachment name
+                        filename = attachment.name \
+                            if attachment.name else f'file{no:03}.dat'
+
+                        app.add_header(
+                            'Content-Disposition',
+                            'attachment; filename="{}"'.format(
+                                Header(filename, 'utf-8')),
+                        )
+                        mixed.attach(app)
+                base = mixed
+
+            if pgp:
+                logger.debug("Securing Email with PGP Encryption")
+                # Set our header information to include in the encryption
+                base['From'] = formataddr(
+                    (None, from_addr[1]), charset='utf-8')
+                base['To'] = formataddr((None, to_addr), charset='utf-8')
+                base['Subject'] = \
+                    Header(subject, NotifyEmail._get_charset(subject))
+
+                # Apply our encryption
+                encrypted_content = \
+                    pgp.encrypt(base.as_string(), to_addr)
+
+                if not encrypted_content:
+                    # Unable to send notification
+                    msg = 'Unable to encrypt email via PGP'
+                    logger.warning(msg)
+                    raise AppriseEmailException(msg)
+
+                # prepare our messsage
+                base = MIMEMultipart(
+                    "encrypted", protocol="application/pgp-encrypted")
+
+                # Store Autocrypt header (DeltaChat Support)
+                base.add_header(
+                    "Autocrypt",
+                    "addr=%s; prefer-encrypt=mutual" % formataddr(
+                        (False, to_addr), charset='utf-8'))
+
+                # Set Encryption Info Part
+                enc_payload = MIMEText("Version: 1", "plain")
+                enc_payload.set_type("application/pgp-encrypted")
+                base.attach(enc_payload)
+
+                enc_payload = MIMEBase("application", "octet-stream")
+                enc_payload.set_payload(encrypted_content)
+                base.attach(enc_payload)
+
+            # Apply any provided custom headers
+            for k, v in headers.items():
+                base[k] = Header(v, NotifyEmail._get_charset(v))
+
+            base['Subject'] = \
+                Header(subject, NotifyEmail._get_charset(subject))
+            base['From'] = formataddr(from_addr, charset='utf-8')
+            base['To'] = formataddr((to_name, to_addr), charset='utf-8')
+            base['Message-ID'] = make_msgid(domain=smtp_host)
+            base['Date'] = \
+                datetime.now(timezone.utc)\
+                .strftime("%a, %d %b %Y %H:%M:%S +0000")
+
+            if cc:
+                base['Cc'] = ','.join(_cc)
+
+            if reply_to:
+                base['Reply-To'] = ','.join(_reply_to)
+
+            yield EmailMessage(
+                recipient=to_addr,
+                to_addrs=[to_addr] + list(_cc) + list(_bcc),
+                body=base.as_string())
diff --git a/apprise/plugins/email/common.py b/apprise/plugins/email/common.py
new file mode 100644
index 000000000..f14ef8811
--- /dev/null
+++ b/apprise/plugins/email/common.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+import dataclasses
+import typing as t
+
+from ...exception import ApprisePluginException
+
+
+class AppriseEmailException(ApprisePluginException):
+    """
+    Thrown when there is an error with the Email Attachment
+    """
+    def __init__(self, message, error_code=601):
+        super().__init__(message, error_code=error_code)
+
+
+class WebBaseLogin:
+    """
+    This class is just used in conjunction of the default emailers
+    to best formulate a login to it using the data detected
+    """
+    # User Login must be Email Based
+    EMAIL = 'Email'
+
+    # User Login must UserID Based
+    USERID = 'UserID'
+
+
+# Secure Email Modes
+class SecureMailMode:
+    INSECURE = "insecure"
+    SSL = "ssl"
+    STARTTLS = "starttls"
+
+
+# Define all of the secure modes (used during validation)
+SECURE_MODES = {
+    SecureMailMode.STARTTLS: {
+        'default_port': 587,
+    },
+    SecureMailMode.SSL: {
+        'default_port': 465,
+    },
+    SecureMailMode.INSECURE: {
+        'default_port': 25,
+    },
+}
+
+
+@dataclasses.dataclass
+class EmailMessage:
+    """
+    Our message structure
+    """
+    recipient: str
+    to_addrs: t.List[str]
+    body: str
diff --git a/apprise/plugins/email/templates.py b/apprise/plugins/email/templates.py
new file mode 100644
index 000000000..0d87ff95a
--- /dev/null
+++ b/apprise/plugins/email/templates.py
@@ -0,0 +1,272 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+import re
+from .common import (SecureMailMode, WebBaseLogin)
+
+# To attempt to make this script stupid proof, if we detect an email address
+# that is part of the this table, we can pre-use a lot more defaults if they
+# aren't otherwise specified on the users input.
+EMAIL_TEMPLATES = (
+    # Google GMail
+    (
+        'Google Mail',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>gmail\.com)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.gmail.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Yandex
+    (
+        'Yandex',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>yandex\.(com|ru|ua|by|kz|uz|tr|fr))$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.yandex.ru',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.USERID, )
+        },
+    ),
+
+    # Microsoft Hotmail
+    (
+        'Microsoft Hotmail',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>(hotmail|live)\.com(\.au)?)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp-mail.outlook.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Microsoft Outlook
+    (
+        'Microsoft Outlook',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>(smtp\.)?outlook\.com(\.au)?)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.outlook.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Microsoft Office 365 (Email Server)
+    # You must specify an authenticated sender address in the from= settings
+    # and a valid email in the to= to deliver your emails to
+    (
+        'Microsoft Office 365',
+        re.compile(
+            r'^[^@]+@(?P<domain>(smtp\.)?office365\.com)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.office365.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+        },
+    ),
+
+    # Yahoo Mail
+    (
+        'Yahoo Mail',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>yahoo\.(ca|com))$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.mail.yahoo.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Fast Mail (Series 1)
+    (
+        'Fast Mail',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>fastmail\.(com|cn|co\.uk|com\.au|de|es|fm|fr|im|'
+            r'in|jp|mx|net|nl|org|se|to|tw|uk|us))$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.fastmail.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Fast Mail (Series 2)
+    (
+        'Fast Mail Extended Addresses',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>123mail\.org|airpost\.net|eml\.cc|fmail\.co\.uk|'
+            r'fmgirl\.com|fmguy\.com|mailbolt\.com|mailcan\.com|'
+            r'mailhaven\.com|mailmight\.com|ml1\.net|mm\.st|myfastmail\.com|'
+            r'proinbox\.com|promessage\.com|rushpost\.com|sent\.(as|at|com)|'
+            r'speedymail\.org|warpmail\.net|xsmail\.com|150mail\.com|'
+            r'150ml\.com|16mail\.com|2-mail\.com|4email\.net|50mail\.com|'
+            r'allmail\.net|bestmail\.us|cluemail\.com|elitemail\.org|'
+            r'emailcorner\.net|emailengine\.(net|org)|emailgroups\.net|'
+            r'emailplus\.org|emailuser\.net|f-m\.fm|fast-email\.com|'
+            r'fast-mail\.org|fastem\.com|fastemail\.us|fastemailer\.com|'
+            r'fastest\.cc|fastimap\.com|fastmailbox\.net|fastmessaging\.com|'
+            r'fea\.st|fmailbox\.com|ftml\.net|h-mail\.us|hailmail\.net|'
+            r'imap-mail\.com|imap\.cc|imapmail\.org|inoutbox\.com|'
+            r'internet-e-mail\.com|internet-mail\.org|internetemails\.net|'
+            r'internetmailing\.net|jetemail\.net|justemail\.net|'
+            r'letterboxes\.org|mail-central\.com|mail-page\.com|'
+            r'mailandftp\.com|mailas\.com|mailc\.net|mailforce\.net|'
+            r'mailftp\.com|mailingaddress\.org|mailite\.com|mailnew\.com|'
+            r'mailsent\.net|mailservice\.ms|mailup\.net|mailworks\.org|'
+            r'mymacmail\.com|nospammail\.net|ownmail\.net|petml\.com|'
+            r'postinbox\.com|postpro\.net|realemail\.net|reallyfast\.biz|'
+            r'reallyfast\.info|speedpost\.net|ssl-mail\.com|swift-mail\.com|'
+            r'the-fastest\.net|the-quickest\.com|theinternetemail\.com|'
+            r'veryfast\.biz|veryspeedy\.net|yepmail\.net)$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.fastmail.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Zoho Mail (Free)
+    (
+        'Zoho Mail',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>zoho(mail)?\.com)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.zoho.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # SendGrid (Email Server)
+    # You must specify an authenticated sender address in the from= settings
+    # and a valid email in the to= to deliver your emails to
+    (
+        'SendGrid',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>(\.smtp)?sendgrid\.(com|net))$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.sendgrid.net',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.USERID, )
+        },
+    ),
+
+    # 163.com
+    (
+        '163.com',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>163\.com)$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.163.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Foxmail.com
+    (
+        'Foxmail.com',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>(foxmail|qq)\.com)$', re.I),
+        {
+            'port': 587,
+            'smtp_host': 'smtp.qq.com',
+            'secure': True,
+            'secure_mode': SecureMailMode.STARTTLS,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Comcast.net
+    (
+        'Comcast.net',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>(comcast)\.net)$', re.I),
+        {
+            'port': 465,
+            'smtp_host': 'smtp.comcast.net',
+            'secure': True,
+            'secure_mode': SecureMailMode.SSL,
+            'login_type': (WebBaseLogin.EMAIL, )
+        },
+    ),
+
+    # Catch All
+    (
+        'Custom',
+        re.compile(
+            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
+            r'(?P<domain>.+)$', re.I),
+        {
+            # Setting smtp_host to None is a way of
+            # auto-detecting it based on other parameters
+            # specified.  There is no reason to ever modify
+            # this Catch All
+            'smtp_host': None,
+        },
+    ),
+)
diff --git a/apprise/plugins/emby.py b/apprise/plugins/emby.py
index 5824932e8..23d781ab9 100644
--- a/apprise/plugins/emby.py
+++ b/apprise/plugins/emby.py
@@ -36,7 +36,7 @@
 
 from .base import NotifyBase
 from ..url import PrivacyMode
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..common import NotifyType
 from .. import __version__ as VERSION
 from ..locale import gettext_lazy as _
diff --git a/apprise/plugins/fcm/__init__.py b/apprise/plugins/fcm/__init__.py
index e5db817e2..b04d7c372 100644
--- a/apprise/plugins/fcm/__init__.py
+++ b/apprise/plugins/fcm/__init__.py
@@ -52,10 +52,8 @@
 from json import dumps
 from ..base import NotifyBase
 from ...common import NotifyType
-from ...utils import validate_regex
-from ...utils import parse_list
-from ...utils import parse_bool
-from ...utils import dict_full_update
+from ...utils.parse import validate_regex, parse_list, parse_bool
+from ...utils.logic import dict_full_update
 from ...common import NotifyImageSize
 from ...apprise_attachment import AppriseAttachment
 from ...locale import gettext_lazy as _
diff --git a/apprise/plugins/fcm/color.py b/apprise/plugins/fcm/color.py
index 20149eedd..5d646599f 100644
--- a/apprise/plugins/fcm/color.py
+++ b/apprise/plugins/fcm/color.py
@@ -34,7 +34,7 @@
 # https://firebase.google.com/docs/reference/fcm/rest/v1/\
 #       projects.messages#androidnotification
 import re
-from ...utils import parse_bool
+from ...utils.parse import parse_bool
 from ...common import NotifyType
 from ...asset import AppriseAsset
 
diff --git a/apprise/plugins/feishu.py b/apprise/plugins/feishu.py
index 9b3c74ea4..db9bc4cd6 100644
--- a/apprise/plugins/feishu.py
+++ b/apprise/plugins/feishu.py
@@ -38,7 +38,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/flock.py b/apprise/plugins/flock.py
index 99ce3582b..2cbac98b8 100644
--- a/apprise/plugins/flock.py
+++ b/apprise/plugins/flock.py
@@ -48,9 +48,7 @@
 from ..common import NotifyType
 from ..common import NotifyFormat
 from ..common import NotifyImageSize
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/gnome.py b/apprise/plugins/gnome.py
index 0a4133731..2d5aab432 100644
--- a/apprise/plugins/gnome.py
+++ b/apprise/plugins/gnome.py
@@ -29,7 +29,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 # Default our global support flag
diff --git a/apprise/plugins/google_chat.py b/apprise/plugins/google_chat.py
index f12e24029..4bada830c 100644
--- a/apprise/plugins/google_chat.py
+++ b/apprise/plugins/google_chat.py
@@ -61,7 +61,7 @@
 from .base import NotifyBase
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/gotify.py b/apprise/plugins/gotify.py
index 1be2d0052..c6ad8c751 100644
--- a/apprise/plugins/gotify.py
+++ b/apprise/plugins/gotify.py
@@ -36,7 +36,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType, NotifyFormat
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/growl.py b/apprise/plugins/growl.py
index e6f6237e3..9ecd6a4b6 100644
--- a/apprise/plugins/growl.py
+++ b/apprise/plugins/growl.py
@@ -30,7 +30,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 # Default our global support flag
diff --git a/apprise/plugins/home_assistant.py b/apprise/plugins/home_assistant.py
index c59b58a9a..b3f2bb72a 100644
--- a/apprise/plugins/home_assistant.py
+++ b/apprise/plugins/home_assistant.py
@@ -37,7 +37,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/httpsms.py b/apprise/plugins/httpsms.py
index b4da6c627..55fac8570 100644
--- a/apprise/plugins/httpsms.py
+++ b/apprise/plugins/httpsms.py
@@ -33,9 +33,7 @@
 import json
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/ifttt.py b/apprise/plugins/ifttt.py
index 64d9cc31b..b791a2c51 100644
--- a/apprise/plugins/ifttt.py
+++ b/apprise/plugins/ifttt.py
@@ -46,8 +46,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/join.py b/apprise/plugins/join.py
index 239f9682f..6a3489daf 100644
--- a/apprise/plugins/join.py
+++ b/apprise/plugins/join.py
@@ -42,9 +42,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/kavenegar.py b/apprise/plugins/kavenegar.py
index ea3bd8ed3..cff4b0a0c 100644
--- a/apprise/plugins/kavenegar.py
+++ b/apprise/plugins/kavenegar.py
@@ -40,9 +40,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/kumulos.py b/apprise/plugins/kumulos.py
index 941f163db..cea7ed0eb 100644
--- a/apprise/plugins/kumulos.py
+++ b/apprise/plugins/kumulos.py
@@ -41,7 +41,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/lametric.py b/apprise/plugins/lametric.py
index b6124a91f..cab3b4484 100644
--- a/apprise/plugins/lametric.py
+++ b/apprise/plugins/lametric.py
@@ -92,10 +92,8 @@
 from json import dumps
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
 from ..locale import gettext_lazy as _
-from ..utils import is_hostname
-from ..utils import is_ipaddr
+from ..utils.parse import validate_regex, is_hostname, is_ipaddr
 
 # A URL Parser to detect App ID
 LAMETRIC_APP_ID_DETECTOR_RE = re.compile(
diff --git a/apprise/plugins/line.py b/apprise/plugins/line.py
index c177e26f8..fae90a2fe 100644
--- a/apprise/plugins/line.py
+++ b/apprise/plugins/line.py
@@ -37,9 +37,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import validate_regex
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import validate_regex, parse_list, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/lunasea.py b/apprise/plugins/lunasea.py
index 97291fc9e..db14f06f7 100644
--- a/apprise/plugins/lunasea.py
+++ b/apprise/plugins/lunasea.py
@@ -36,10 +36,8 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import parse_list
-from ..utils import is_hostname
-from ..utils import is_ipaddr
-from ..utils import parse_bool
+from ..utils.parse import (
+    parse_list, is_hostname, is_ipaddr, parse_bool)
 from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
 
diff --git a/apprise/plugins/macosx.py b/apprise/plugins/macosx.py
index 153a88a21..e30414cbe 100644
--- a/apprise/plugins/macosx.py
+++ b/apprise/plugins/macosx.py
@@ -33,7 +33,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 # Default our global support flag
diff --git a/apprise/plugins/mailgun.py b/apprise/plugins/mailgun.py
index b68183957..682f19e42 100644
--- a/apprise/plugins/mailgun.py
+++ b/apprise/plugins/mailgun.py
@@ -59,10 +59,8 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_emails
-from ..utils import parse_bool
-from ..utils import is_email
-from ..utils import validate_regex
+from ..utils.parse import (
+    parse_emails, parse_bool, is_email, validate_regex)
 from ..logger import logger
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/plugins/mastodon.py b/apprise/plugins/mastodon.py
index 85379ba0a..955835b19 100644
--- a/apprise/plugins/mastodon.py
+++ b/apprise/plugins/mastodon.py
@@ -38,9 +38,7 @@
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
 
diff --git a/apprise/plugins/matrix.py b/apprise/plugins/matrix.py
index bf2e2dd94..552bfba66 100644
--- a/apprise/plugins/matrix.py
+++ b/apprise/plugins/matrix.py
@@ -45,10 +45,8 @@
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import PersistentStoreMode
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import is_hostname
-from ..utils import validate_regex
+from ..utils.parse import (
+    parse_bool, parse_list, is_hostname, validate_regex)
 from ..locale import gettext_lazy as _
 
 # Define default path
diff --git a/apprise/plugins/mattermost.py b/apprise/plugins/mattermost.py
index a9a3ee62b..5ffcc8fd7 100644
--- a/apprise/plugins/mattermost.py
+++ b/apprise/plugins/mattermost.py
@@ -42,9 +42,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_bool, parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 # Some Reference Locations:
diff --git a/apprise/plugins/messagebird.py b/apprise/plugins/messagebird.py
index 053c59303..661ee1c4e 100644
--- a/apprise/plugins/messagebird.py
+++ b/apprise/plugins/messagebird.py
@@ -36,9 +36,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/misskey.py b/apprise/plugins/misskey.py
index 21d0250df..dff5aef84 100644
--- a/apprise/plugins/misskey.py
+++ b/apprise/plugins/misskey.py
@@ -49,7 +49,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/mqtt.py b/apprise/plugins/mqtt.py
index c13b2ecef..bb003cdd9 100644
--- a/apprise/plugins/mqtt.py
+++ b/apprise/plugins/mqtt.py
@@ -41,8 +41,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import parse_list, parse_bool
 from ..locale import gettext_lazy as _
 
 # Default our global support flag
diff --git a/apprise/plugins/msg91.py b/apprise/plugins/msg91.py
index cf5fea9b6..694ae9867 100644
--- a/apprise/plugins/msg91.py
+++ b/apprise/plugins/msg91.py
@@ -40,9 +40,8 @@
 from json import dumps
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no, parse_bool
-from ..utils import validate_regex
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/msteams.py b/apprise/plugins/msteams.py
index 83f85c79b..b706146e5 100644
--- a/apprise/plugins/msteams.py
+++ b/apprise/plugins/msteams.py
@@ -85,10 +85,8 @@
 from ..common import NotifyImageSize
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..utils import apply_template
-from ..utils import TemplateType
+from ..utils.parse import parse_bool, validate_regex
+from ..utils.templates import apply_template, TemplateType
 from ..apprise_attachment import AppriseAttachment
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/plugins/nextcloud.py b/apprise/plugins/nextcloud.py
index 7afe2d9af..a0f28aff4 100644
--- a/apprise/plugins/nextcloud.py
+++ b/apprise/plugins/nextcloud.py
@@ -31,7 +31,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
+from ..utils.parse import parse_list
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/nextcloudtalk.py b/apprise/plugins/nextcloudtalk.py
index 7ba953c3d..9c72be500 100644
--- a/apprise/plugins/nextcloudtalk.py
+++ b/apprise/plugins/nextcloudtalk.py
@@ -32,7 +32,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
+from ..utils.parse import parse_list
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/notica.py b/apprise/plugins/notica.py
index 9c5778af2..e08f48568 100644
--- a/apprise/plugins/notica.py
+++ b/apprise/plugins/notica.py
@@ -46,7 +46,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/notifiarr.py b/apprise/plugins/notifiarr.py
index dcb940a2b..ffb29b361 100644
--- a/apprise/plugins/notifiarr.py
+++ b/apprise/plugins/notifiarr.py
@@ -35,8 +35,7 @@
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
 from ..common import NotifyImageSize
-from ..utils import parse_list, parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
 from .discord import USER_ROLE_DETECTION_RE
 
 # Used to break path apart into list of channels
diff --git a/apprise/plugins/notifico.py b/apprise/plugins/notifico.py
index db88bf6b2..b343d4331 100644
--- a/apprise/plugins/notifico.py
+++ b/apprise/plugins/notifico.py
@@ -46,8 +46,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/ntfy.py b/apprise/plugins/ntfy.py
index 76ee2118b..8ad5c70dc 100644
--- a/apprise/plugins/ntfy.py
+++ b/apprise/plugins/ntfy.py
@@ -46,11 +46,8 @@
 from ..common import NotifyType
 from ..common import NotifyImageSize
 from ..locale import gettext_lazy as _
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import is_hostname
-from ..utils import is_ipaddr
-from ..utils import validate_regex
+from ..utils.parse import (
+    parse_list, parse_bool, is_hostname, is_ipaddr, validate_regex)
 from ..url import PrivacyMode
 from ..attachment.base import AttachBase
 from ..attachment.memory import AttachMemory
diff --git a/apprise/plugins/office365.py b/apprise/plugins/office365.py
index 4d51b12fa..2f0f4ca88 100644
--- a/apprise/plugins/office365.py
+++ b/apprise/plugins/office365.py
@@ -49,9 +49,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import is_email
-from ..utils import parse_emails
-from ..utils import validate_regex
+from ..utils.parse import is_email, parse_emails, validate_regex
 from ..locale import gettext_lazy as _
 from ..common import PersistentStoreMode
 
diff --git a/apprise/plugins/one_signal.py b/apprise/plugins/one_signal.py
index 0bac77ee2..faebdf66c 100644
--- a/apprise/plugins/one_signal.py
+++ b/apprise/plugins/one_signal.py
@@ -40,12 +40,8 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import decode_b64_dict
-from ..utils import encode_b64_dict
-from ..utils import validate_regex
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import is_email
+from ..utils.base64 import decode_b64_dict, encode_b64_dict
+from ..utils.parse import validate_regex, parse_list, parse_bool, is_email
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/opsgenie.py b/apprise/plugins/opsgenie.py
index 228ba7557..1c4c3b244 100644
--- a/apprise/plugins/opsgenie.py
+++ b/apprise/plugins/opsgenie.py
@@ -53,10 +53,7 @@
 from .base import NotifyBase
 from ..common import NotifyType, NOTIFY_TYPES
 from ..common import PersistentStoreMode
-from ..utils import validate_regex
-from ..utils import is_uuid
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import validate_regex, is_uuid, parse_list, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/pagerduty.py b/apprise/plugins/pagerduty.py
index 51bd38887..3c876e2be 100644
--- a/apprise/plugins/pagerduty.py
+++ b/apprise/plugins/pagerduty.py
@@ -38,8 +38,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import validate_regex
-from ..utils import parse_bool
+from ..utils.parse import validate_regex, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/pagertree.py b/apprise/plugins/pagertree.py
index 7d82f677c..57434f61f 100644
--- a/apprise/plugins/pagertree.py
+++ b/apprise/plugins/pagertree.py
@@ -33,8 +33,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/parseplatform.py b/apprise/plugins/parseplatform.py
index 808c3099c..f6a6248d7 100644
--- a/apprise/plugins/parseplatform.py
+++ b/apprise/plugins/parseplatform.py
@@ -32,7 +32,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 # Used to break path apart into list of targets
diff --git a/apprise/plugins/plivo.py b/apprise/plugins/plivo.py
index d4c97ef36..893c0e94b 100644
--- a/apprise/plugins/plivo.py
+++ b/apprise/plugins/plivo.py
@@ -41,10 +41,8 @@
 from json import dumps
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import (
+    parse_bool, is_phone_no, parse_phone_no, validate_regex)
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/popcorn_notify.py b/apprise/plugins/popcorn_notify.py
index 16d34ab09..d0fc4a665 100644
--- a/apprise/plugins/popcorn_notify.py
+++ b/apprise/plugins/popcorn_notify.py
@@ -30,11 +30,8 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_email
-from ..utils import is_phone_no
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import (
+    is_email, is_phone_no, parse_list, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/prowl.py b/apprise/plugins/prowl.py
index 55c4c6be2..e0e9bd4df 100644
--- a/apprise/plugins/prowl.py
+++ b/apprise/plugins/prowl.py
@@ -30,7 +30,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/pushbullet.py b/apprise/plugins/pushbullet.py
index 2b88bbeda..f017c36ce 100644
--- a/apprise/plugins/pushbullet.py
+++ b/apprise/plugins/pushbullet.py
@@ -31,10 +31,8 @@
 from json import loads
 
 from .base import NotifyBase
-from ..utils import is_email
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import is_email, parse_list, validate_regex
 from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
 
diff --git a/apprise/plugins/pushdeer.py b/apprise/plugins/pushdeer.py
index 226e3f210..d71a15faa 100644
--- a/apprise/plugins/pushdeer.py
+++ b/apprise/plugins/pushdeer.py
@@ -30,7 +30,7 @@
 
 from ..common import NotifyType
 from .base import NotifyBase
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 # Syntax:
diff --git a/apprise/plugins/pushed.py b/apprise/plugins/pushed.py
index c0727ad15..205c8b4ba 100644
--- a/apprise/plugins/pushed.py
+++ b/apprise/plugins/pushed.py
@@ -34,8 +34,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 # Used to detect and parse channels
diff --git a/apprise/plugins/pushjet.py b/apprise/plugins/pushjet.py
index bc368b109..d8a38f470 100644
--- a/apprise/plugins/pushjet.py
+++ b/apprise/plugins/pushjet.py
@@ -32,7 +32,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/pushme.py b/apprise/plugins/pushme.py
index 54d4032de..384b557f5 100644
--- a/apprise/plugins/pushme.py
+++ b/apprise/plugins/pushme.py
@@ -31,8 +31,7 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import validate_regex
-from ..utils import parse_bool
+from ..utils.parse import validate_regex, parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/pushover.py b/apprise/plugins/pushover.py
index 07881884a..c8fcb58f5 100644
--- a/apprise/plugins/pushover.py
+++ b/apprise/plugins/pushover.py
@@ -34,8 +34,7 @@
 from ..common import NotifyType
 from ..common import NotifyFormat
 from ..conversion import convert_between
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
 
diff --git a/apprise/plugins/pushsafer.py b/apprise/plugins/pushsafer.py
index dd5a6c82c..cd7999a06 100644
--- a/apprise/plugins/pushsafer.py
+++ b/apprise/plugins/pushsafer.py
@@ -32,8 +32,7 @@
 from .base import NotifyBase
 from .. import exception
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/pushy.py b/apprise/plugins/pushy.py
index d0995df3b..10517a7cc 100644
--- a/apprise/plugins/pushy.py
+++ b/apprise/plugins/pushy.py
@@ -34,8 +34,7 @@
 from json import dumps, loads
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 # Used to detect a Device and Topic
diff --git a/apprise/plugins/reddit.py b/apprise/plugins/reddit.py
index 1c261be9c..73a93144f 100644
--- a/apprise/plugins/reddit.py
+++ b/apprise/plugins/reddit.py
@@ -57,9 +57,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 from .. import __title__, __version__
 
diff --git a/apprise/plugins/revolt.py b/apprise/plugins/revolt.py
index 2edbed330..ebafbf5ab 100644
--- a/apprise/plugins/revolt.py
+++ b/apprise/plugins/revolt.py
@@ -46,8 +46,7 @@
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import validate_regex
-from ..utils import parse_list
+from ..utils.parse import validate_regex, parse_list
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/rocketchat.py b/apprise/plugins/rocketchat.py
index 7850c3d05..1c0049d3e 100644
--- a/apprise/plugins/rocketchat.py
+++ b/apprise/plugins/rocketchat.py
@@ -37,8 +37,7 @@
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
+from ..utils.parse import parse_list, parse_bool
 from ..locale import gettext_lazy as _
 
 IS_CHANNEL = re.compile(r'^#(?P<name>[A-Za-z0-9_-]+)$')
diff --git a/apprise/plugins/rsyslog.py b/apprise/plugins/rsyslog.py
index 195a2f3ca..530cf51e8 100644
--- a/apprise/plugins/rsyslog.py
+++ b/apprise/plugins/rsyslog.py
@@ -31,7 +31,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/ryver.py b/apprise/plugins/ryver.py
index c792c3d78..ae003f439 100644
--- a/apprise/plugins/ryver.py
+++ b/apprise/plugins/ryver.py
@@ -41,8 +41,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/sendgrid.py b/apprise/plugins/sendgrid.py
index b4f92e9f4..65d71044b 100644
--- a/apprise/plugins/sendgrid.py
+++ b/apprise/plugins/sendgrid.py
@@ -53,9 +53,7 @@
 from .. import exception
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import is_email
-from ..utils import validate_regex
+from ..utils.parse import parse_list, is_email, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/serverchan.py b/apprise/plugins/serverchan.py
index db1571417..b62280316 100644
--- a/apprise/plugins/serverchan.py
+++ b/apprise/plugins/serverchan.py
@@ -31,7 +31,7 @@
 
 from ..common import NotifyType
 from .base import NotifyBase
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/ses.py b/apprise/plugins/ses.py
index 30e59702d..5292650a1 100644
--- a/apprise/plugins/ses.py
+++ b/apprise/plugins/ses.py
@@ -99,10 +99,8 @@
 from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_emails
-from ..utils import validate_regex
+from ..utils.parse import parse_emails, validate_regex, is_email
 from ..locale import gettext_lazy as _
-from ..utils import is_email
 
 # Our Regin Identifier
 # support us-gov-west-1 syntax as well
diff --git a/apprise/plugins/seven.py b/apprise/plugins/seven.py
index 9e05b5e0b..2977448f5 100644
--- a/apprise/plugins/seven.py
+++ b/apprise/plugins/seven.py
@@ -34,8 +34,7 @@
 import json
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
+from ..utils.parse import is_phone_no, parse_phone_no
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/sfr.py b/apprise/plugins/sfr.py
index 27ea0fb0b..9a0181afa 100644
--- a/apprise/plugins/sfr.py
+++ b/apprise/plugins/sfr.py
@@ -47,8 +47,7 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
+from ..utils.parse import is_phone_no, parse_phone_no
 from ..url import PrivacyMode
 
 
diff --git a/apprise/plugins/signal_api.py b/apprise/plugins/signal_api.py
index 9a0191237..72c340f06 100644
--- a/apprise/plugins/signal_api.py
+++ b/apprise/plugins/signal_api.py
@@ -33,9 +33,7 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from .. import exception
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
+from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..url import PrivacyMode
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/plugins/simplepush.py b/apprise/plugins/simplepush.py
index f66b64c3c..3c269a9af 100644
--- a/apprise/plugins/simplepush.py
+++ b/apprise/plugins/simplepush.py
@@ -33,7 +33,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 from base64 import urlsafe_b64encode
diff --git a/apprise/plugins/sinch.py b/apprise/plugins/sinch.py
index 51cdea32b..bc267afb2 100644
--- a/apprise/plugins/sinch.py
+++ b/apprise/plugins/sinch.py
@@ -42,9 +42,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/slack.py b/apprise/plugins/slack.py
index 11d78e4c1..afe5a2596 100644
--- a/apprise/plugins/slack.py
+++ b/apprise/plugins/slack.py
@@ -82,10 +82,8 @@
 from ..common import NotifyImageSize
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import is_email
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import (
+    is_email, parse_bool, parse_list, validate_regex)
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/smseagle.py b/apprise/plugins/smseagle.py
index 159433106..65ff0ffcc 100644
--- a/apprise/plugins/smseagle.py
+++ b/apprise/plugins/smseagle.py
@@ -34,10 +34,8 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from .. import exception
-from ..utils import validate_regex
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
+from ..utils.parse import (
+    validate_regex, is_phone_no, parse_phone_no, parse_bool)
 from ..url import PrivacyMode
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/plugins/smsmanager.py b/apprise/plugins/smsmanager.py
index a4552ad4b..fb8ab068b 100644
--- a/apprise/plugins/smsmanager.py
+++ b/apprise/plugins/smsmanager.py
@@ -37,10 +37,8 @@
 import requests
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import (
+    is_phone_no, parse_phone_no, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/smtp2go.py b/apprise/plugins/smtp2go.py
index a19e523fc..1c5919030 100644
--- a/apprise/plugins/smtp2go.py
+++ b/apprise/plugins/smtp2go.py
@@ -52,10 +52,8 @@
 from .. import exception
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_emails
-from ..utils import parse_bool
-from ..utils import is_email
-from ..utils import validate_regex
+from ..utils.parse import (
+    parse_emails, parse_bool, is_email, validate_regex)
 from ..locale import gettext_lazy as _
 
 SMTP2GO_HTTP_ERROR_MAP = {
diff --git a/apprise/plugins/sns.py b/apprise/plugins/sns.py
index 9deb9f7b0..bd5444920 100644
--- a/apprise/plugins/sns.py
+++ b/apprise/plugins/sns.py
@@ -39,9 +39,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 # Topic Detection
diff --git a/apprise/plugins/sparkpost.py b/apprise/plugins/sparkpost.py
index 4e4233cad..8c34c1d2b 100644
--- a/apprise/plugins/sparkpost.py
+++ b/apprise/plugins/sparkpost.py
@@ -61,11 +61,9 @@
 from .. import exception
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import is_email
 from email.utils import formataddr
-from ..utils import validate_regex
-from ..utils import parse_emails
-from ..utils import parse_bool
+from ..utils.parse import (
+    validate_regex, parse_emails, parse_bool, is_email)
 from ..locale import gettext_lazy as _
 
 # Provide some known codes SparkPost uses and what they translate to:
diff --git a/apprise/plugins/splunk.py b/apprise/plugins/splunk.py
index 3c39e7a4b..3379bcfb5 100644
--- a/apprise/plugins/splunk.py
+++ b/apprise/plugins/splunk.py
@@ -40,7 +40,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType, NOTIFY_TYPES
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/streamlabs.py b/apprise/plugins/streamlabs.py
index ba48c170e..849437fba 100644
--- a/apprise/plugins/streamlabs.py
+++ b/apprise/plugins/streamlabs.py
@@ -40,7 +40,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/syslog.py b/apprise/plugins/syslog.py
index f0be5d4f6..df0a31db7 100644
--- a/apprise/plugins/syslog.py
+++ b/apprise/plugins/syslog.py
@@ -30,7 +30,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/techuluspush.py b/apprise/plugins/techuluspush.py
index 629650148..6d0f45d4d 100644
--- a/apprise/plugins/techuluspush.py
+++ b/apprise/plugins/techuluspush.py
@@ -55,7 +55,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 # Token required as part of the API request
diff --git a/apprise/plugins/telegram.py b/apprise/plugins/telegram.py
index fba4b6609..30429ca36 100644
--- a/apprise/plugins/telegram.py
+++ b/apprise/plugins/telegram.py
@@ -64,9 +64,7 @@
 from ..common import NotifyImageSize
 from ..common import NotifyFormat
 from ..common import PersistentStoreMode
-from ..utils import parse_bool
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_bool, parse_list, validate_regex
 from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
 
diff --git a/apprise/plugins/threema.py b/apprise/plugins/threema.py
index 55293a1cb..8639c5caa 100644
--- a/apprise/plugins/threema.py
+++ b/apprise/plugins/threema.py
@@ -37,11 +37,8 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import validate_regex
-from ..utils import is_email
+from ..utils.parse import is_phone_no, validate_regex, is_email, parse_list
 from ..url import PrivacyMode
-from ..utils import parse_list
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/twilio.py b/apprise/plugins/twilio.py
index d8666199c..e6a9bcd96 100644
--- a/apprise/plugins/twilio.py
+++ b/apprise/plugins/twilio.py
@@ -50,9 +50,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/twist.py b/apprise/plugins/twist.py
index 66f70f525..1d5881ec5 100644
--- a/apprise/plugins/twist.py
+++ b/apprise/plugins/twist.py
@@ -39,8 +39,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyFormat
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import is_email
+from ..utils.parse import parse_list, is_email
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/twitter.py b/apprise/plugins/twitter.py
index 6d352ea66..497feba04 100644
--- a/apprise/plugins/twitter.py
+++ b/apprise/plugins/twitter.py
@@ -39,9 +39,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import parse_bool
-from ..utils import validate_regex
+from ..utils.parse import parse_list, parse_bool, validate_regex
 from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
 
diff --git a/apprise/plugins/voipms.py b/apprise/plugins/voipms.py
index 4ec7af281..b4624c484 100644
--- a/apprise/plugins/voipms.py
+++ b/apprise/plugins/voipms.py
@@ -39,9 +39,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import is_email
-from ..utils import parse_phone_no
+from ..utils.parse import is_phone_no, is_email, parse_phone_no
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/vonage.py b/apprise/plugins/vonage.py
index 3a9b23417..f57e80a8a 100644
--- a/apprise/plugins/vonage.py
+++ b/apprise/plugins/vonage.py
@@ -36,9 +36,7 @@
 from .base import NotifyBase
 from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/webexteams.py b/apprise/plugins/webexteams.py
index ccee386b5..bc75378b6 100644
--- a/apprise/plugins/webexteams.py
+++ b/apprise/plugins/webexteams.py
@@ -66,7 +66,7 @@
 from .base import NotifyBase
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 # Extend HTTP Error Messages
diff --git a/apprise/plugins/wecombot.py b/apprise/plugins/wecombot.py
index 03282cd9f..ba639401c 100644
--- a/apprise/plugins/wecombot.py
+++ b/apprise/plugins/wecombot.py
@@ -61,7 +61,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import validate_regex
+from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/whatsapp.py b/apprise/plugins/whatsapp.py
index e0322b80d..34f1be216 100644
--- a/apprise/plugins/whatsapp.py
+++ b/apprise/plugins/whatsapp.py
@@ -46,9 +46,7 @@
 from json import loads, dumps
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import is_phone_no
-from ..utils import parse_phone_no
-from ..utils import validate_regex
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/windows.py b/apprise/plugins/windows.py
index fd9454b28..a9621fdc3 100644
--- a/apprise/plugins/windows.py
+++ b/apprise/plugins/windows.py
@@ -31,7 +31,7 @@
 from .base import NotifyBase
 from ..common import NotifyImageSize
 from ..common import NotifyType
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 # Default our global support flag
diff --git a/apprise/plugins/workflows.py b/apprise/plugins/workflows.py
index e047a9f5c..87b6b1b27 100644
--- a/apprise/plugins/workflows.py
+++ b/apprise/plugins/workflows.py
@@ -59,10 +59,8 @@
 from ..common import NotifyImageSize
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_bool
-from ..utils import validate_regex
-from ..utils import apply_template
-from ..utils import TemplateType
+from ..utils.parse import parse_bool, validate_regex
+from ..utils.templates import apply_template, TemplateType
 from ..apprise_attachment import AppriseAttachment
 from ..locale import gettext_lazy as _
 
diff --git a/apprise/plugins/wxpusher.py b/apprise/plugins/wxpusher.py
index e7c9bd672..96a571c42 100644
--- a/apprise/plugins/wxpusher.py
+++ b/apprise/plugins/wxpusher.py
@@ -42,8 +42,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyFormat
-from ..utils import parse_list
-from ..utils import validate_regex
+from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/xbmc.py b/apprise/plugins/xbmc.py
index 61e7b1e2e..6b9a77961 100644
--- a/apprise/plugins/xbmc.py
+++ b/apprise/plugins/xbmc.py
@@ -33,7 +33,7 @@
 from ..url import PrivacyMode
 from ..common import NotifyType
 from ..common import NotifyImageSize
-from ..utils import parse_bool
+from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
 
 
diff --git a/apprise/plugins/zulip.py b/apprise/plugins/zulip.py
index 34c6d813e..be35d500a 100644
--- a/apprise/plugins/zulip.py
+++ b/apprise/plugins/zulip.py
@@ -63,10 +63,7 @@
 
 from .base import NotifyBase
 from ..common import NotifyType
-from ..utils import parse_list
-from ..utils import validate_regex
-from ..utils import is_email
-from ..utils import remove_suffix
+from ..utils.parse import (parse_list, validate_regex, is_email)
 from ..locale import gettext_lazy as _
 
 # A Valid Bot Name
@@ -192,7 +189,10 @@ def __init__(self, botname, organization, token, targets=None, **kwargs):
 
             # The botname
             botname = match.group('name')
-            botname = remove_suffix(botname, '-bot')
+            suffix = '-bot'
+            # Eliminate suffix if found
+            botname = \
+                botname[:-len(suffix)] if botname.endswith(suffix) else botname
             self.botname = botname
 
         except (TypeError, AttributeError):
diff --git a/apprise/url.py b/apprise/url.py
index e3c9c17d8..ce8fa5116 100644
--- a/apprise/url.py
+++ b/apprise/url.py
@@ -39,11 +39,8 @@
 
 from .locale import gettext_lazy as _
 from .asset import AppriseAsset
-from .utils import urlencode
-from .utils import parse_url
-from .utils import parse_bool
-from .utils import parse_list
-from .utils import parse_phone_no
+from .utils.parse import (
+    urlencode, parse_url, parse_bool, parse_list, parse_phone_no)
 
 # Used to break a path list into parts
 PATHSPLIT_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
diff --git a/apprise/utils/__init__.py b/apprise/utils/__init__.py
new file mode 100644
index 000000000..e91e2fbb8
--- /dev/null
+++ b/apprise/utils/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
diff --git a/apprise/utils/base64.py b/apprise/utils/base64.py
new file mode 100644
index 000000000..78e5427b9
--- /dev/null
+++ b/apprise/utils/base64.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import copy
+import json
+import binascii
+import typing
+import base64
+
+
+def decode_b64_dict(di: dict) -> dict:
+    """
+    decodes base64 dictionary previously encoded
+
+    string entries prefixed with `b64:` are targeted
+    """
+    di = copy.deepcopy(di)
+    for k, v in di.items():
+        if not isinstance(v, str) or not v.startswith("b64:"):
+            continue
+
+        try:
+            parsed_v = base64.b64decode(v[4:])
+            parsed_v = json.loads(parsed_v)
+
+        except (ValueError, TypeError, binascii.Error,
+                json.decoder.JSONDecodeError):
+            # ValueError: the length of altchars is not 2.
+            # TypeError: invalid input
+            # binascii.Error: not base64 (bad padding)
+            # json.decoder.JSONDecodeError: Bad JSON object
+
+            parsed_v = v
+        di[k] = parsed_v
+    return di
+
+
+def encode_b64_dict(di: dict, encoding='utf-8') -> typing.Tuple[dict, bool]:
+    """
+    Encodes dictionary entries containing binary types (int, float) into base64
+
+    Final product is always string based values
+    """
+    di = copy.deepcopy(di)
+    needs_decoding = False
+    for k, v in di.items():
+        if isinstance(v, str):
+            continue
+
+        try:
+            encoded = base64.urlsafe_b64encode(json.dumps(v).encode(encoding))
+            encoded = "b64:{}".format(encoded.decode(encoding))
+            needs_decoding = True
+
+        except (ValueError, TypeError):
+            # ValueError:
+            #  - the length of altchars is not 2.
+            # TypeError:
+            #  - json not searializable or
+            #  - bytes object not passed into urlsafe_b64encode()
+            encoded = str(v)
+
+        di[k] = encoded
+    return di, needs_decoding
diff --git a/apprise/utils/cwe312.py b/apprise/utils/cwe312.py
new file mode 100644
index 000000000..6a6f9e191
--- /dev/null
+++ b/apprise/utils/cwe312.py
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import re
+from .parse import (parse_url, is_hostname)
+
+
+def cwe312_word(word, force=False, advanced=True, threshold=5):
+    """
+    This function was written to help mask secure/private information that may
+    or may not be found within Apprise. The idea is to provide a presentable
+    word response that the user who prepared it would understand, yet not
+    reveal any private information for any potential intruder
+
+    For more detail see CWE-312 @
+       https://cwe.mitre.org/data/definitions/312.html
+
+    The `force` is an optional argument used to keep the string formatting
+    consistent and in one place. If set, the content passed in is presumed
+    to be containing secret information and will be updated accordingly.
+
+    If advanced is set to `True` then content is additionally checked for
+    upper/lower/ascii/numerical variances. If an obscurity threshold is
+    reached, then content is considered secret
+    """
+
+    class Variance:
+        """
+        A Simple List of Possible Character Variances
+        """
+        # An Upper Case Character (ABCDEF... etc)
+        ALPHA_UPPER = '+'
+        # An Lower Case Character (abcdef... etc)
+        ALPHA_LOWER = '-'
+        # A Special Character ($%^;... etc)
+        SPECIAL = 's'
+        # A Numerical Character (1234... etc)
+        NUMERIC = 'n'
+
+    if not (isinstance(word, str) and word.strip()):
+        # not a password if it's not something we even support
+        return word
+
+    # Formatting
+    word = word.strip()
+    if force:
+        # We're forcing the representation to be a secret
+        # We do this for consistency
+        return '{}...{}'.format(word[0:1], word[-1:])
+
+    elif len(word) > 1 and \
+            not is_hostname(word, ipv4=True, ipv6=True, underscore=False):
+        # Verify if it is a hostname or not
+        return '{}...{}'.format(word[0:1], word[-1:])
+
+    elif len(word) >= 16:
+        # an IP will be 15 characters so we don't want to use a smaller
+        # value then 16 (e.g 101.102.103.104)
+        # we can assume very long words are passwords otherwise
+        return '{}...{}'.format(word[0:1], word[-1:])
+
+    if advanced:
+        #
+        # Mark word a secret based on it's obscurity
+        #
+
+        # Our variances will increase depending on these variables:
+        last_variance = None
+        obscurity = 0
+
+        for c in word:
+            # Detect our variance
+            if c.isdigit():
+                variance = Variance.NUMERIC
+            elif c.isalpha() and c.isupper():
+                variance = Variance.ALPHA_UPPER
+            elif c.isalpha() and c.islower():
+                variance = Variance.ALPHA_LOWER
+            else:
+                variance = Variance.SPECIAL
+
+            if last_variance != variance or variance == Variance.SPECIAL:
+                obscurity += 1
+
+                if obscurity >= threshold:
+                    return '{}...{}'.format(word[0:1], word[-1:])
+
+            last_variance = variance
+
+    # Otherwise we're good; return our word
+    return word
+
+
+def cwe312_url(url):
+    """
+    This function was written to help mask secure/private information that may
+    or may not be found on an Apprise URL. The idea is to not disrupt the
+    structure of the previous URL too much, yet still protect the users
+    private information from being logged directly to screen.
+
+    For more detail see CWE-312 @
+       https://cwe.mitre.org/data/definitions/312.html
+
+    For example, consider the URL: http://user:password@localhost/
+
+    When passed into this function, the return value would be:
+      http://user:****@localhost/
+
+    Since apprise allows you to put private information everywhere in it's
+    custom URLs, it uses this function to manipulate the content before
+    returning to any kind of logger.
+
+    The idea is that the URL can still be interpreted by the person who
+    constructed them, but not to an intruder.
+    """
+    # Parse our URL
+    results = parse_url(url)
+    if not results:
+        # Nothing was returned (invalid data was fed in); return our
+        # information as it was fed to us (without changing it)
+        return url
+
+    # Update our URL with values
+    results['password'] = cwe312_word(results['password'], force=True)
+    if not results['schema'].startswith('http'):
+        results['user'] = cwe312_word(results['user'])
+        results['host'] = cwe312_word(results['host'])
+
+    else:
+        results['host'] = cwe312_word(results['host'], advanced=False)
+        results['user'] = cwe312_word(results['user'], advanced=False)
+
+    # Apply our full path scan in all cases
+    results['fullpath'] = '/' + \
+        '/'.join([cwe312_word(x)
+                 for x in re.split(
+                     r'[\\/]+',
+                     results['fullpath'].lstrip('/'))]) \
+        if results['fullpath'] else ''
+
+    #
+    # Now re-assemble our URL for display purposes
+    #
+
+    # Determine Authentication
+    auth = ''
+    if results['user'] and results['password']:
+        auth = '{user}:{password}@'.format(
+            user=results['user'],
+            password=results['password'],
+        )
+    elif results['user']:
+        auth = '{user}@'.format(
+            user=results['user'],
+        )
+
+    params = ''
+    if results['qsd']:
+        params = '?{}'.format(
+            "&".join(["{}={}".format(k, cwe312_word(v, force=(
+                k in ('password', 'secret', 'pass', 'token', 'key',
+                      'id', 'apikey', 'to'))))
+                      for k, v in results['qsd'].items()]))
+
+    return '{schema}://{auth}{hostname}{port}{fullpath}{params}'.format(
+        schema=results['schema'],
+        auth=auth,
+        # never encode hostname since we're expecting it to be a valid one
+        hostname=results['host'],
+        port='' if not results['port'] else ':{}'.format(results['port']),
+        fullpath=results['fullpath'] if results['fullpath'] else '',
+        params=params,
+    )
diff --git a/apprise/utils/disk.py b/apprise/utils/disk.py
new file mode 100644
index 000000000..9d826aaa6
--- /dev/null
+++ b/apprise/utils/disk.py
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import re
+import os
+import platform
+from os.path import expanduser
+from ..logger import logger
+
+# Pre-Escape content since we reference it so much
+ESCAPED_PATH_SEPARATOR = re.escape('\\/')
+ESCAPED_WIN_PATH_SEPARATOR = re.escape('\\')
+ESCAPED_NUX_PATH_SEPARATOR = re.escape('/')
+
+TIDY_WIN_PATH_RE = re.compile(
+    r'(^[%s]{2}|[^%s\s][%s]|[\s][%s]{2}])([%s]+)' % (
+        ESCAPED_WIN_PATH_SEPARATOR,
+        ESCAPED_WIN_PATH_SEPARATOR,
+        ESCAPED_WIN_PATH_SEPARATOR,
+        ESCAPED_WIN_PATH_SEPARATOR,
+        ESCAPED_WIN_PATH_SEPARATOR,
+    ),
+)
+TIDY_WIN_TRIM_RE = re.compile(
+    r'^(.+[^:][^%s])[\s%s]*$' % (
+        ESCAPED_WIN_PATH_SEPARATOR,
+        ESCAPED_WIN_PATH_SEPARATOR,
+    ),
+)
+
+TIDY_NUX_PATH_RE = re.compile(
+    r'([%s])([%s]+)' % (
+        ESCAPED_NUX_PATH_SEPARATOR,
+        ESCAPED_NUX_PATH_SEPARATOR,
+    ),
+)
+
+# A simple path decoder we can re-use which looks after
+# ensuring our file info is expanded correctly when provided
+# a path.
+__PATH_DECODER = os.path.expandvars if \
+    platform.system() == 'Windows' else os.path.expanduser
+
+
+def path_decode(path):
+    """
+    Returns the fully decoded path based on the operating system
+    """
+    return os.path.abspath(__PATH_DECODER(path))
+
+
+def tidy_path(path):
+    """take a filename and or directory and attempts to tidy it up by removing
+    trailing slashes and correcting any formatting issues.
+
+    For example: ////absolute//path// becomes:
+        /absolute/path
+
+    """
+    # Windows
+    path = TIDY_WIN_PATH_RE.sub('\\1', path.strip())
+    # Linux
+    path = TIDY_NUX_PATH_RE.sub('\\1', path)
+
+    # Windows Based (final) Trim
+    path = expanduser(TIDY_WIN_TRIM_RE.sub('\\1', path))
+    return path
+
+
+def dir_size(path, max_depth=3, missing_okay=True, _depth=0, _errors=None):
+    """
+    Scans a provided path an returns it's size (in bytes) of path provided
+    """
+
+    if _errors is None:
+        _errors = set()
+
+    if _depth > max_depth:
+        _errors.add(path)
+        return (0, _errors)
+
+    total = 0
+    try:
+        with os.scandir(path) as it:
+            for entry in it:
+                try:
+                    if entry.is_file(follow_symlinks=False):
+                        total += entry.stat(follow_symlinks=False).st_size
+
+                    elif entry.is_dir(follow_symlinks=False):
+                        (totals, _) = dir_size(
+                            entry.path,
+                            max_depth=max_depth,
+                            _depth=_depth + 1,
+                            _errors=_errors)
+                        total += totals
+
+                except FileNotFoundError:
+                    # no worries; Nothing to do
+                    continue
+
+                except (OSError, IOError) as e:
+                    # Permission error of some kind or disk problem...
+                    # There is nothing we can do at this point
+                    _errors.add(entry.path)
+                    logger.warning(
+                        'dir_size detetcted inaccessible path: %s',
+                        os.fsdecode(entry.path))
+                    logger.debug('dir_size Exception: %s' % str(e))
+                    continue
+
+    except FileNotFoundError:
+        if not missing_okay:
+            # Conditional error situation
+            _errors.add(path)
+
+    except (OSError, IOError) as e:
+        # Permission error of some kind or disk problem...
+        # There is nothing we can do at this point
+        _errors.add(path)
+        logger.warning(
+            'dir_size detetcted inaccessible path: %s',
+            os.fsdecode(path))
+        logger.debug('dir_size Exception: %s' % str(e))
+
+    return (total, _errors)
+
+
+def bytes_to_str(value):
+    """
+    Covert an integer (in bytes) into it's string representation with
+    acompanied unit value (such as B, KB, MB, GB, TB, etc)
+    """
+    unit = 'B'
+    try:
+        value = float(value)
+
+    except (ValueError, TypeError):
+        return None
+
+    if value >= 1024.0:
+        value = value / 1024.0
+        unit = 'KB'
+        if value >= 1024.0:
+            value = value / 1024.0
+            unit = 'MB'
+            if value >= 1024.0:
+                value = value / 1024.0
+                unit = 'GB'
+                if value >= 1024.0:
+                    value = value / 1024.0
+                    unit = 'TB'
+
+    return '%.2f%s' % (round(value, 2), unit)
diff --git a/apprise/utils/logic.py b/apprise/utils/logic.py
new file mode 100644
index 000000000..4d560bdb0
--- /dev/null
+++ b/apprise/utils/logic.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+from itertools import chain
+from .. import common
+from .parse import parse_list
+
+
+def is_exclusive_match(logic, data, match_all=common.MATCH_ALL_TAG,
+                       match_always=common.MATCH_ALWAYS_TAG):
+    """
+
+    The data variable should always be a set of strings that the logic can be
+    compared against. It should be a set.  If it isn't already, then it will
+    be converted as such. These identify the tags themselves.
+
+    Our logic should be a list as well:
+      - top level entries are treated as an 'or'
+      - second level (or more) entries are treated as 'and'
+
+      examples:
+        logic="tagA, tagB"                = tagA or tagB
+        logic=['tagA', 'tagB']            = tagA or tagB
+        logic=[('tagA', 'tagC'), 'tagB']  = (tagA and tagC) or tagB
+        logic=[('tagB', 'tagC')]          = tagB and tagC
+
+    If `match_always` is not set to None, then its value is added as an 'or'
+    to all specified logic searches.
+    """
+
+    if isinstance(logic, str):
+        # Update our logic to support our delimiters
+        logic = set(parse_list(logic))
+
+    if not logic:
+        # If there is no logic to apply then we're done early; we only match
+        # if there is also no data to match against
+        return not data
+
+    if not isinstance(logic, (list, tuple, set)):
+        # garbage input
+        return False
+
+    if match_always:
+        # Add our match_always to our logic searching if secified
+        logic = chain(logic, [match_always])
+
+    # Track what we match against; but by default we do not match
+    # against anything
+    matched = False
+
+    # Every entry here will be or'ed with the next
+    for entry in logic:
+        if not isinstance(entry, (str, list, tuple, set)):
+            # Garbage entry in our logic found
+            return False
+
+        # treat these entries as though all elements found
+        # must exist in the notification service
+        entries = set(parse_list(entry))
+        if not entries:
+            # We got a bogus set of tags to parse
+            # If there is no logic to apply then we're done early; we only
+            # match if there is also no data to match against
+            return not data
+
+        if len(entries.intersection(data.union({match_all}))) == len(entries):
+            # our set contains all of the entries found
+            # in our notification data set
+            matched = True
+            break
+
+        # else: keep looking
+
+    # Return True if we matched against our logic (or simply none was
+    # specified).
+    return matched
+
+
+def dict_full_update(dict1, dict2):
+    """
+    Takes 2 dictionaries (dict1 and dict2) that contain sub-dictionaries and
+    gracefully merges them into dict1.
+
+    This is similar to: dict1.update(dict2) except that internal dictionaries
+    are also recursively applied.
+    """
+    def _merge(dict1, dict2):
+        for k in dict2:
+            if k in dict1 and isinstance(dict1[k], dict) \
+                    and isinstance(dict2[k], dict):
+                _merge(dict1[k], dict2[k])
+            else:
+                dict1[k] = dict2[k]
+
+    _merge(dict1, dict2)
+    return
diff --git a/apprise/utils/module.py b/apprise/utils/module.py
new file mode 100644
index 000000000..55a2904f3
--- /dev/null
+++ b/apprise/utils/module.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import sys
+import importlib.util
+from ..logger import logger
+
+
+def import_module(path, name):
+    """
+    Load our module based on path
+    """
+    spec = importlib.util.spec_from_file_location(name, path)
+    try:
+        module = importlib.util.module_from_spec(spec)
+        sys.modules[name] = module
+
+        spec.loader.exec_module(module)
+
+    except Exception as e:
+        # module isn't loadable
+        try:
+            del sys.modules[name]
+
+        except KeyError:
+            # nothing to clean up
+            pass
+
+        module = None
+
+        logger.debug(
+            'Module exception raised from %s (name=%s) %s',
+            path, name, str(e))
+
+    return module
diff --git a/apprise/utils.py b/apprise/utils/parse.py
similarity index 68%
rename from apprise/utils.py
rename to apprise/utils/parse.py
index c536405e4..1d506d2ad 100644
--- a/apprise/utils.py
+++ b/apprise/utils/parse.py
@@ -25,69 +25,15 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-import copy
 import re
-import sys
-import json
-import os
-import binascii
-import platform
-import typing
-import base64
-from itertools import chain
-from os.path import expanduser
 from functools import reduce
-from . import common
-from .logger import logger
 from urllib.parse import unquote
 from urllib.parse import quote
 from urllib.parse import urlparse
 from urllib.parse import urlencode as _urlencode
 
-import importlib.util
 
-
-# A simple path decoder we can re-use which looks after
-# ensuring our file info is expanded correctly when provided
-# a path.
-__PATH_DECODER = os.path.expandvars if \
-    platform.system() == 'Windows' else os.path.expanduser
-
-
-def path_decode(path):
-    """
-    Returns the fully decoded path based on the operating system
-    """
-    return os.path.abspath(__PATH_DECODER(path))
-
-
-def import_module(path, name):
-    """
-    Load our module based on path
-    """
-    spec = importlib.util.spec_from_file_location(name, path)
-    try:
-        module = importlib.util.module_from_spec(spec)
-        sys.modules[name] = module
-
-        spec.loader.exec_module(module)
-
-    except Exception as e:
-        # module isn't loadable
-        try:
-            del sys.modules[name]
-
-        except KeyError:
-            # nothing to clean up
-            pass
-
-        module = None
-
-        logger.debug(
-            'Module exception raised from %s (name=%s) %s',
-            path, name, str(e))
-
-    return module
+from .disk import tidy_path
 
 
 # URL Indexing Table for returns via parse_url()
@@ -109,41 +55,6 @@ def import_module(path, name):
 # String Delimiters without the whitespace
 STRING_DELIMITERS_NO_WS = r'[\[\]\;,]+'
 
-# Pre-Escape content since we reference it so much
-ESCAPED_PATH_SEPARATOR = re.escape('\\/')
-ESCAPED_WIN_PATH_SEPARATOR = re.escape('\\')
-ESCAPED_NUX_PATH_SEPARATOR = re.escape('/')
-
-TIDY_WIN_PATH_RE = re.compile(
-    r'(^[%s]{2}|[^%s\s][%s]|[\s][%s]{2}])([%s]+)' % (
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-    ),
-)
-TIDY_WIN_TRIM_RE = re.compile(
-    r'^(.+[^:][^%s])[\s%s]*$' % (
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-    ),
-)
-
-TIDY_NUX_PATH_RE = re.compile(
-    r'([%s])([%s]+)' % (
-        ESCAPED_NUX_PATH_SEPARATOR,
-        ESCAPED_NUX_PATH_SEPARATOR,
-    ),
-)
-
-TIDY_NUX_TRIM_RE = re.compile(
-    r'([^%s])[\s%s]+$' % (
-        ESCAPED_NUX_PATH_SEPARATOR,
-        ESCAPED_NUX_PATH_SEPARATOR,
-    ),
-)
-
 # The handling of custom arguments passed in the URL; we treat any
 # argument (which would otherwise appear in the qsd area of our parse_url()
 # function differently if they start with a +, - or : value
@@ -229,35 +140,6 @@ def import_module(path, name):
 REGEX_VALIDATE_LOOKUP = {}
 
 
-class Singleton(type):
-    """
-    Our Singleton MetaClass
-    """
-    _instances = {}
-
-    def __call__(cls, *args, **kwargs):
-        """
-        instantiate our singleton meta entry
-        """
-        if cls not in cls._instances:
-            # we have not every built an instance before.  Build one now.
-            cls._instances[cls] = super().__call__(*args, **kwargs)
-        return cls._instances[cls]
-
-
-class TemplateType:
-    """
-    Defines the different template types we can perform parsing on
-    """
-    # RAW does nothing at all to the content being parsed
-    # data is taken at it's absolute value
-    RAW = 'raw'
-
-    # Data is presumed to be of type JSON and is therefore escaped
-    # if required to do so (such as single quotes)
-    JSON = 'json'
-
-
 def is_ipaddr(addr, ipv4=True, ipv6=True):
     """
     Validates against IPV4 and IPV6 IP Addresses
@@ -544,24 +426,6 @@ def is_email(address):
     return False
 
 
-def tidy_path(path):
-    """take a filename and or directory and attempts to tidy it up by removing
-    trailing slashes and correcting any formatting issues.
-
-    For example: ////absolute//path// becomes:
-        /absolute/path
-
-    """
-    # Windows
-    path = TIDY_WIN_PATH_RE.sub('\\1', path.strip())
-    # Linux
-    path = TIDY_NUX_PATH_RE.sub('\\1', path)
-
-    # Windows Based (final) Trim
-    path = expanduser(TIDY_WIN_TRIM_RE.sub('\\1', path))
-    return path
-
-
 def parse_qsd(qs, simple=False, plus_to_space=False, sanitize=True):
     """
     Query String Dictionary Builder
@@ -1056,37 +920,6 @@ def parse_emails(*args, store_unparseable=True, **kwargs):
     return result
 
 
-def parse_urls(*args, store_unparseable=True, **kwargs):
-    """
-    Takes a string containing URLs separated by comma's and/or spaces and
-    returns a list.
-    """
-
-    result = []
-    for arg in args:
-        if isinstance(arg, str) and arg:
-            _result = URL_DETECTION_RE.findall(arg)
-            if _result:
-                result += _result
-
-            elif not _result and store_unparseable:
-                # we had content passed into us that was lost because it was
-                # so poorly formatted that it didn't even come close to
-                # meeting the regular expression we defined. We intentially
-                # keep it as part of our result set so that parsing done
-                # at a higher level can at least report this to the end user
-                # and hopefully give them some indication as to what they
-                # may have done wrong.
-                result += \
-                    [x for x in filter(bool, re.split(STRING_DELIMITERS, arg))]
-
-        elif isinstance(arg, (set, list, tuple)):
-            # Use recursion to handle the list of URLs
-            result += parse_urls(*arg, store_unparseable=store_unparseable)
-
-    return result
-
-
 def url_assembly(**kwargs):
     """
     This function reverses the parse_url() function by taking in the provided
@@ -1156,6 +989,37 @@ def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
         errors=errors)
 
 
+def parse_urls(*args, store_unparseable=True, **kwargs):
+    """
+    Takes a string containing URLs separated by comma's and/or spaces and
+    returns a list.
+    """
+
+    result = []
+    for arg in args:
+        if isinstance(arg, str) and arg:
+            _result = URL_DETECTION_RE.findall(arg)
+            if _result:
+                result += _result
+
+            elif not _result and store_unparseable:
+                # we had content passed into us that was lost because it was
+                # so poorly formatted that it didn't even come close to
+                # meeting the regular expression we defined. We intentially
+                # keep it as part of our result set so that parsing done
+                # at a higher level can at least report this to the end user
+                # and hopefully give them some indication as to what they
+                # may have done wrong.
+                result += \
+                    [x for x in filter(bool, re.split(STRING_DELIMITERS, arg))]
+
+        elif isinstance(arg, (set, list, tuple)):
+            # Use recursion to handle the list of URLs
+            result += parse_urls(*arg, store_unparseable=store_unparseable)
+
+    return result
+
+
 def parse_list(*args, cast=None, allow_whitespace=True):
     """
     Take a string list and break it into a delimited
@@ -1201,77 +1065,6 @@ def parse_list(*args, cast=None, allow_whitespace=True):
             [x.strip() for x in filter(bool, list(set(result))) if x.strip()])
 
 
-def is_exclusive_match(logic, data, match_all=common.MATCH_ALL_TAG,
-                       match_always=common.MATCH_ALWAYS_TAG):
-    """
-
-    The data variable should always be a set of strings that the logic can be
-    compared against. It should be a set.  If it isn't already, then it will
-    be converted as such. These identify the tags themselves.
-
-    Our logic should be a list as well:
-      - top level entries are treated as an 'or'
-      - second level (or more) entries are treated as 'and'
-
-      examples:
-        logic="tagA, tagB"                = tagA or tagB
-        logic=['tagA', 'tagB']            = tagA or tagB
-        logic=[('tagA', 'tagC'), 'tagB']  = (tagA and tagC) or tagB
-        logic=[('tagB', 'tagC')]          = tagB and tagC
-
-    If `match_always` is not set to None, then its value is added as an 'or'
-    to all specified logic searches.
-    """
-
-    if isinstance(logic, str):
-        # Update our logic to support our delimiters
-        logic = set(parse_list(logic))
-
-    if not logic:
-        # If there is no logic to apply then we're done early; we only match
-        # if there is also no data to match against
-        return not data
-
-    if not isinstance(logic, (list, tuple, set)):
-        # garbage input
-        return False
-
-    if match_always:
-        # Add our match_always to our logic searching if secified
-        logic = chain(logic, [match_always])
-
-    # Track what we match against; but by default we do not match
-    # against anything
-    matched = False
-
-    # Every entry here will be or'ed with the next
-    for entry in logic:
-        if not isinstance(entry, (str, list, tuple, set)):
-            # Garbage entry in our logic found
-            return False
-
-        # treat these entries as though all elements found
-        # must exist in the notification service
-        entries = set(parse_list(entry))
-        if not entries:
-            # We got a bogus set of tags to parse
-            # If there is no logic to apply then we're done early; we only
-            # match if there is also no data to match against
-            return not data
-
-        if len(entries.intersection(data.union({match_all}))) == len(entries):
-            # our set contains all of the entries found
-            # in our notification data set
-            matched = True
-            break
-
-        # else: keep looking
-
-    # Return True if we matched against our logic (or simply none was
-    # specified).
-    return matched
-
-
 def validate_regex(value, regex=r'[^\s]+', flags=re.I, strip=True, fmt=None):
     """
     A lot of the tokens, secrets, api keys, etc all have some regular
@@ -1346,383 +1139,3 @@ def validate_regex(value, regex=r'[^\s]+', flags=re.I, strip=True, fmt=None):
 
     # Return our response
     return value.strip() if strip else value
-
-
-def cwe312_word(word, force=False, advanced=True, threshold=5):
-    """
-    This function was written to help mask secure/private information that may
-    or may not be found within Apprise. The idea is to provide a presentable
-    word response that the user who prepared it would understand, yet not
-    reveal any private information for any potential intruder
-
-    For more detail see CWE-312 @
-       https://cwe.mitre.org/data/definitions/312.html
-
-    The `force` is an optional argument used to keep the string formatting
-    consistent and in one place. If set, the content passed in is presumed
-    to be containing secret information and will be updated accordingly.
-
-    If advanced is set to `True` then content is additionally checked for
-    upper/lower/ascii/numerical variances. If an obscurity threshold is
-    reached, then content is considered secret
-    """
-
-    class Variance:
-        """
-        A Simple List of Possible Character Variances
-        """
-        # An Upper Case Character (ABCDEF... etc)
-        ALPHA_UPPER = '+'
-        # An Lower Case Character (abcdef... etc)
-        ALPHA_LOWER = '-'
-        # A Special Character ($%^;... etc)
-        SPECIAL = 's'
-        # A Numerical Character (1234... etc)
-        NUMERIC = 'n'
-
-    if not (isinstance(word, str) and word.strip()):
-        # not a password if it's not something we even support
-        return word
-
-    # Formatting
-    word = word.strip()
-    if force:
-        # We're forcing the representation to be a secret
-        # We do this for consistency
-        return '{}...{}'.format(word[0:1], word[-1:])
-
-    elif len(word) > 1 and \
-            not is_hostname(word, ipv4=True, ipv6=True, underscore=False):
-        # Verify if it is a hostname or not
-        return '{}...{}'.format(word[0:1], word[-1:])
-
-    elif len(word) >= 16:
-        # an IP will be 15 characters so we don't want to use a smaller
-        # value then 16 (e.g 101.102.103.104)
-        # we can assume very long words are passwords otherwise
-        return '{}...{}'.format(word[0:1], word[-1:])
-
-    if advanced:
-        #
-        # Mark word a secret based on it's obscurity
-        #
-
-        # Our variances will increase depending on these variables:
-        last_variance = None
-        obscurity = 0
-
-        for c in word:
-            # Detect our variance
-            if c.isdigit():
-                variance = Variance.NUMERIC
-            elif c.isalpha() and c.isupper():
-                variance = Variance.ALPHA_UPPER
-            elif c.isalpha() and c.islower():
-                variance = Variance.ALPHA_LOWER
-            else:
-                variance = Variance.SPECIAL
-
-            if last_variance != variance or variance == Variance.SPECIAL:
-                obscurity += 1
-
-                if obscurity >= threshold:
-                    return '{}...{}'.format(word[0:1], word[-1:])
-
-            last_variance = variance
-
-    # Otherwise we're good; return our word
-    return word
-
-
-def cwe312_url(url):
-    """
-    This function was written to help mask secure/private information that may
-    or may not be found on an Apprise URL. The idea is to not disrupt the
-    structure of the previous URL too much, yet still protect the users
-    private information from being logged directly to screen.
-
-    For more detail see CWE-312 @
-       https://cwe.mitre.org/data/definitions/312.html
-
-    For example, consider the URL: http://user:password@localhost/
-
-    When passed into this function, the return value would be:
-      http://user:****@localhost/
-
-    Since apprise allows you to put private information everywhere in it's
-    custom URLs, it uses this function to manipulate the content before
-    returning to any kind of logger.
-
-    The idea is that the URL can still be interpreted by the person who
-    constructed them, but not to an intruder.
-    """
-    # Parse our URL
-    results = parse_url(url)
-    if not results:
-        # Nothing was returned (invalid data was fed in); return our
-        # information as it was fed to us (without changing it)
-        return url
-
-    # Update our URL with values
-    results['password'] = cwe312_word(results['password'], force=True)
-    if not results['schema'].startswith('http'):
-        results['user'] = cwe312_word(results['user'])
-        results['host'] = cwe312_word(results['host'])
-
-    else:
-        results['host'] = cwe312_word(results['host'], advanced=False)
-        results['user'] = cwe312_word(results['user'], advanced=False)
-
-    # Apply our full path scan in all cases
-    results['fullpath'] = '/' + \
-        '/'.join([cwe312_word(x)
-                 for x in re.split(
-                     r'[\\/]+',
-                     results['fullpath'].lstrip('/'))]) \
-        if results['fullpath'] else ''
-
-    #
-    # Now re-assemble our URL for display purposes
-    #
-
-    # Determine Authentication
-    auth = ''
-    if results['user'] and results['password']:
-        auth = '{user}:{password}@'.format(
-            user=results['user'],
-            password=results['password'],
-        )
-    elif results['user']:
-        auth = '{user}@'.format(
-            user=results['user'],
-        )
-
-    params = ''
-    if results['qsd']:
-        params = '?{}'.format(
-            "&".join(["{}={}".format(k, cwe312_word(v, force=(
-                k in ('password', 'secret', 'pass', 'token', 'key',
-                      'id', 'apikey', 'to'))))
-                      for k, v in results['qsd'].items()]))
-
-    return '{schema}://{auth}{hostname}{port}{fullpath}{params}'.format(
-        schema=results['schema'],
-        auth=auth,
-        # never encode hostname since we're expecting it to be a valid one
-        hostname=results['host'],
-        port='' if not results['port'] else ':{}'.format(results['port']),
-        fullpath=results['fullpath'] if results['fullpath'] else '',
-        params=params,
-    )
-
-
-def apply_template(template, app_mode=TemplateType.RAW, **kwargs):
-    """
-    Takes a template in a str format and applies all of the keywords
-    and their values to it.
-
-    The app$mode is used to dictact any pre-processing that needs to take place
-    to the escaped string prior to it being placed.  The idea here is for
-    elements to be placed in a JSON response for example should be escaped
-    early in their string format.
-
-    The template must contain keywords wrapped in in double
-    squirly braces like {{keyword}}.  These are matched to the respected
-    kwargs passed into this function.
-
-    If there is no match found, content is not swapped.
-
-    """
-
-    def _escape_raw(content):
-        # No escaping necessary
-        return content
-
-    def _escape_json(content):
-        # remove surounding quotes
-        return json.dumps(content)[1:-1]
-
-    # Our escape function
-    fn = _escape_json if app_mode == TemplateType.JSON else _escape_raw
-
-    lookup = [re.escape(x) for x in kwargs.keys()]
-
-    # Compile this into a list
-    mask_r = re.compile(
-        re.escape('{{') + r'\s*(' + '|'.join(lookup) + r')\s*'
-        + re.escape('}}'), re.IGNORECASE)
-
-    # we index 2 characters off the head and 2 characters from the tail
-    # to drop the '{{' and '}}' surrounding our match so that we can
-    # re-index it back into our list
-    return mask_r.sub(lambda x: fn(kwargs[x.group()[2:-2].strip()]), template)
-
-
-def remove_suffix(value, suffix):
-    """
-    Removes a suffix from the end of a string.
-    """
-    return value[:-len(suffix)] if value.endswith(suffix) else value
-
-
-def dict_full_update(dict1, dict2):
-    """
-    Takes 2 dictionaries (dict1 and dict2) that contain sub-dictionaries and
-    gracefully merges them into dict1.
-
-    This is similar to: dict1.update(dict2) except that internal dictionaries
-    are also recursively applied.
-    """
-    def _merge(dict1, dict2):
-        for k in dict2:
-            if k in dict1 and isinstance(dict1[k], dict) \
-                    and isinstance(dict2[k], dict):
-                _merge(dict1[k], dict2[k])
-            else:
-                dict1[k] = dict2[k]
-
-    _merge(dict1, dict2)
-    return
-
-
-def dir_size(path, max_depth=3, missing_okay=True, _depth=0, _errors=None):
-    """
-    Scans a provided path an returns it's size (in bytes) of path provided
-    """
-
-    if _errors is None:
-        _errors = set()
-
-    if _depth > max_depth:
-        _errors.add(path)
-        return (0, _errors)
-
-    total = 0
-    try:
-        with os.scandir(path) as it:
-            for entry in it:
-                try:
-                    if entry.is_file(follow_symlinks=False):
-                        total += entry.stat(follow_symlinks=False).st_size
-
-                    elif entry.is_dir(follow_symlinks=False):
-                        (totals, _) = dir_size(
-                            entry.path,
-                            max_depth=max_depth,
-                            _depth=_depth + 1,
-                            _errors=_errors)
-                        total += totals
-
-                except FileNotFoundError:
-                    # no worries; Nothing to do
-                    continue
-
-                except (OSError, IOError) as e:
-                    # Permission error of some kind or disk problem...
-                    # There is nothing we can do at this point
-                    _errors.add(entry.path)
-                    logger.warning(
-                        'dir_size detetcted inaccessible path: %s',
-                        os.fsdecode(entry.path))
-                    logger.debug('dir_size Exception: %s' % str(e))
-                    continue
-
-    except FileNotFoundError:
-        if not missing_okay:
-            # Conditional error situation
-            _errors.add(path)
-
-    except (OSError, IOError) as e:
-        # Permission error of some kind or disk problem...
-        # There is nothing we can do at this point
-        _errors.add(path)
-        logger.warning(
-            'dir_size detetcted inaccessible path: %s',
-            os.fsdecode(path))
-        logger.debug('dir_size Exception: %s' % str(e))
-
-    return (total, _errors)
-
-
-def bytes_to_str(value):
-    """
-    Covert an integer (in bytes) into it's string representation with
-    acompanied unit value (such as B, KB, MB, GB, TB, etc)
-    """
-    unit = 'B'
-    try:
-        value = float(value)
-
-    except (ValueError, TypeError):
-        return None
-
-    if value >= 1024.0:
-        value = value / 1024.0
-        unit = 'KB'
-        if value >= 1024.0:
-            value = value / 1024.0
-            unit = 'MB'
-            if value >= 1024.0:
-                value = value / 1024.0
-                unit = 'GB'
-                if value >= 1024.0:
-                    value = value / 1024.0
-                    unit = 'TB'
-
-    return '%.2f%s' % (round(value, 2), unit)
-
-
-def decode_b64_dict(di: dict) -> dict:
-    """
-    decodes base64 dictionary previously encoded
-
-    string entries prefixed with `b64:` are targeted
-    """
-    di = copy.deepcopy(di)
-    for k, v in di.items():
-        if not isinstance(v, str) or not v.startswith("b64:"):
-            continue
-
-        try:
-            parsed_v = base64.b64decode(v[4:])
-            parsed_v = json.loads(parsed_v)
-
-        except (ValueError, TypeError, binascii.Error,
-                json.decoder.JSONDecodeError):
-            # ValueError: the length of altchars is not 2.
-            # TypeError: invalid input
-            # binascii.Error: not base64 (bad padding)
-            # json.decoder.JSONDecodeError: Bad JSON object
-
-            parsed_v = v
-        di[k] = parsed_v
-    return di
-
-
-def encode_b64_dict(di: dict, encoding='utf-8') -> typing.Tuple[dict, bool]:
-    """
-    Encodes dictionary entries containing binary types (int, float) into base64
-
-    Final product is always string based values
-    """
-    di = copy.deepcopy(di)
-    needs_decoding = False
-    for k, v in di.items():
-        if isinstance(v, str):
-            continue
-
-        try:
-            encoded = base64.urlsafe_b64encode(json.dumps(v).encode(encoding))
-            encoded = "b64:{}".format(encoded.decode(encoding))
-            needs_decoding = True
-
-        except (ValueError, TypeError):
-            # ValueError:
-            #  - the length of altchars is not 2.
-            # TypeError:
-            #  - json not searializable or
-            #  - bytes object not passed into urlsafe_b64encode()
-            encoded = str(v)
-
-        di[k] = encoded
-    return di, needs_decoding
diff --git a/apprise/utils/pgp.py b/apprise/utils/pgp.py
new file mode 100644
index 000000000..504e38b15
--- /dev/null
+++ b/apprise/utils/pgp.py
@@ -0,0 +1,354 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+import os
+import hashlib
+from datetime import datetime
+from datetime import timedelta
+from datetime import timezone
+
+from ..apprise_attachment import AppriseAttachment
+from ..asset import AppriseAsset
+from ..logger import logger
+from ..exception import ApprisePluginException
+
+try:
+    import pgpy
+    # Pretty Good Privacy (PGP) Support enabled
+    PGP_SUPPORT = True
+
+except ImportError:
+    # Pretty Good Privacy (PGP) Support disabled
+    PGP_SUPPORT = False
+
+
+class ApprisePGPException(ApprisePluginException):
+    """
+    Thrown when there is an error with the Pretty Good Privacy Controller
+    """
+    def __init__(self, message, error_code=602):
+        super().__init__(message, error_code=error_code)
+
+
+class ApprisePGPController:
+    """
+    Pretty Good Privacy Controller Tool for the Apprise Library
+    """
+
+    # There is no reason a PGP Public Key should exceed 8K in size
+    # If it is more than this, then it is not accepted
+    max_pgp_public_key_size = 8000
+
+    def __init__(self, path, pub_keyfile=None, email=None, asset=None,
+                 **kwargs):
+        """
+        Path should be the directory keys can be written and read from such as
+            <notifyobject>.store.path
+
+            Optionally additionally specify a keyfile to explicitly open
+        """
+
+        # PGP hash
+        self.__key_lookup = {}
+
+        # Directory we can work with
+        self.path = path
+
+        # Our email
+        self.email = email
+
+        # Prepare our Asset Object
+        self.asset = \
+            asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+
+        if pub_keyfile:
+            # Create ourselves an Attachment to work with; this grants us the
+            # ability to pull this key from a remote site or anything else
+            # supported by the Attachment object
+            self._pub_keyfile = AppriseAttachment(asset=self.asset)
+
+            # Add our definition to our pgp_key reference
+            self._pub_keyfile.add(pub_keyfile)
+
+            # Enforce maximum file size
+            self._pub_keyfile[0].max_file_size = self.max_pgp_public_key_size
+
+        else:
+            self._pub_keyfile = None
+
+    def keygen(self, email=None, name=None, force=False):
+        """
+        Generates a set of keys based on email configured.
+        """
+
+        try:
+            # Create a new RSA key pair with 2048-bit strength
+            key = pgpy.PGPKey.new(
+                pgpy.constants.PubKeyAlgorithm.RSAEncryptOrSign, 2048)
+
+        except NameError:
+            # PGPy not installed
+            logger.debug('PGPy not installed; keygen disabled')
+            return False
+
+        if self._pub_keyfile is not None or not self.path:
+            logger.trace(
+                'PGP keygen disabled, reason=%s',
+                'keyfile-defined' if self._pub_keyfile is not None
+                else 'no-write-path')
+            return False
+
+        if not name:
+            name = self.asset.app_id
+
+        if not email:
+            email = self.email
+
+        # Prepare our UID
+        uid = pgpy.PGPUID.new(name, email=email)
+
+        # Filenames
+        file_prefix = email.split('@')[0].lower()
+
+        pub_path = os.path.join(self.path, f'{file_prefix}-pub.asc')
+        prv_path = os.path.join(self.path, f'{file_prefix}-prv.asc')
+
+        if os.path.isfile(pub_path) and not force:
+            logger.debug(
+                'PGP generation skipped; Public Key already exists: %s',
+                pub_path)
+            return True
+
+        # Persistent Storage Key
+        lookup_key = hashlib.sha1(
+            os.path.abspath(pub_path).encode('utf-8')).hexdigest()
+        if lookup_key in self.__key_lookup:
+            # Ensure our key no longer exists
+            del self.__key_lookup[lookup_key]
+
+        # Add the user ID to the key
+        key.add_uid(uid, usage={
+            pgpy.constants.KeyFlags.Sign,
+            pgpy.constants.KeyFlags.EncryptCommunications},
+            hashes=[pgpy.constants.HashAlgorithm.SHA256],
+            ciphers=[pgpy.constants.SymmetricKeyAlgorithm.AES256],
+            compression=[pgpy.constants.CompressionAlgorithm.ZLIB])
+
+        try:
+            # Write our keys to disk
+            with open(pub_path, 'w') as f:
+                f.write(str(key.pubkey))
+
+        except OSError as e:
+            logger.warning('Error writing PGP file %s', pub_path)
+            logger.debug(f'I/O Exception: {e}')
+
+            # Cleanup
+            try:
+                os.unlink(pub_path)
+                logger.trace('Removed %s', pub_path)
+
+            except OSError:
+                pass
+
+        try:
+            with open(prv_path, 'w') as f:
+                f.write(str(key))
+
+        except OSError as e:
+            logger.warning('Error writing PGP file %s', prv_path)
+            logger.debug(f'I/O Exception: {e}')
+
+            try:
+                os.unlink(pub_path)
+                logger.trace('Removed %s', pub_path)
+
+            except OSError:
+                pass
+
+            try:
+                os.unlink(prv_path)
+                logger.trace('Removed %s', prv_path)
+
+            except OSError:
+                pass
+
+            return False
+
+        logger.info(
+            'Wrote PGP Keys for %s/%s',
+            os.path.dirname(pub_path),
+            os.path.basename(pub_path))
+        return True
+
+    def public_keyfile(self, *emails):
+        """
+        Returns the first match of a useable public key based emails provided
+        """
+
+        if not PGP_SUPPORT:
+            msg = 'PGP Support unavailable; install PGPy library'
+            logger.warning(msg)
+            raise ApprisePGPException(msg)
+
+        if self._pub_keyfile is not None:
+            # If our code reaches here, then we fetch our public key
+            pgp_key = self._pub_keyfile[0]
+            if not pgp_key:
+                # We could not access the attachment
+                logger.error(
+                    'Could not access PGP Public Key {}.'.format(
+                        pgp_key.url(privacy=True)))
+                return False
+
+            return pgp_key.path
+
+        elif not self.path:
+            # No path
+            return None
+
+        fnames = [
+            'pgp-public.asc',
+            'pgp-pub.asc',
+            'public.asc',
+            'pub.asc',
+        ]
+
+        if self.email:
+            # Include our email in the list
+            emails = [self.email] + [*emails]
+
+        for email in emails:
+            _entry = email.split('@')[0].lower()
+            fnames.insert(0, f'{_entry}-pub.asc')
+
+            # Lowercase email (Highest Priority)
+            _entry = email.lower()
+            fnames.insert(0, f'{_entry}-pub.asc')
+
+        return next(
+            (os.path.join(self.path, fname)
+             for fname in fnames
+             if os.path.isfile(os.path.join(self.path, fname))),
+            None)
+
+    def public_key(self, *emails, autogen=None):
+        """
+        Opens a spcified pgp public file and returns the key from it which
+        is used to encrypt the message
+        """
+        path = self.public_keyfile(*emails)
+        if not path:
+            if (autogen if autogen is not None else self.asset.pgp_autogen) \
+                    and self.keygen(*emails):
+                path = self.public_keyfile(*emails)
+                if path:
+                    # We should get a hit now
+                    return self.public_key(*emails)
+
+            logger.warning('No PGP Public Key could be loaded')
+            return None
+
+        # Persistent Storage Key
+        key = hashlib.sha1(
+            os.path.abspath(path).encode('utf-8')).hexdigest()
+        if key in self.__key_lookup:
+            # Take an early exit
+            return self.__key_lookup[key]['public_key']
+
+        try:
+            with open(path, 'r') as key_file:
+                public_key, _ = pgpy.PGPKey.from_blob(key_file.read())
+
+        except NameError:
+            # PGPy not installed
+            logger.debug(
+                'PGPy not installed; skipping PGP support: %s', path)
+            return None
+
+        except FileNotFoundError:
+            # Generate keys
+            logger.debug('PGP Public Key file not found: %s', path)
+            return None
+
+        except OSError as e:
+            logger.warning('Error accessing PGP Public Key file %s', path)
+            logger.debug(f'I/O Exception: {e}')
+            return None
+
+        self.__key_lookup[key] = {
+            'public_key': public_key,
+            'expires':
+            datetime.now(timezone.utc) + timedelta(seconds=86400)
+        }
+        return public_key
+
+    # Encrypt message using the recipient's public key
+    def encrypt(self, message, *emails):
+        """
+        If provided a path to a pgp-key, content is encrypted
+        """
+
+        # Acquire our key
+        public_key = self.public_key(*emails)
+        if not public_key:
+            # Encryption not possible
+            return False
+
+        try:
+            message_object = pgpy.PGPMessage.new(message)
+            encrypted_message = public_key.encrypt(message_object)
+            return str(encrypted_message)
+
+        except pgpy.errors.PGPError:
+            # Encryption not Possible
+            logger.debug(
+                'PGP Public Key Corruption; encryption not possible')
+
+        except NameError:
+            # PGPy not installed
+            logger.debug('PGPy not installed; Skipping PGP encryption')
+
+        return None
+
+    def prune(self):
+        """
+        Prunes old entries from the public_key index
+        """
+        self.__key_lookup = {
+            key: value for key, value in self.__key_lookup.items()
+            if value['expires'] > datetime.now(timezone.utc)}
+
+    @property
+    def pub_keyfile(self):
+        """
+        Returns the Public Keyfile Path if set otherwise it returns None
+        This property returns False if a keyfile was provided, but was invalid
+        """
+        return None if self._pub_keyfile is None else (
+            False if not self._pub_keyfile[0] else self._pub_keyfile[0].path)
diff --git a/apprise/utils/singleton.py b/apprise/utils/singleton.py
new file mode 100644
index 000000000..1151a292c
--- /dev/null
+++ b/apprise/utils/singleton.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+class Singleton(type):
+    """
+    Our Singleton MetaClass
+    """
+    _instances = {}
+
+    def __call__(cls, *args, **kwargs):
+        """
+        instantiate our singleton meta entry
+        """
+        if cls not in cls._instances:
+            # we have not every built an instance before.  Build one now.
+            cls._instances[cls] = super().__call__(*args, **kwargs)
+        return cls._instances[cls]
diff --git a/apprise/utils/templates.py b/apprise/utils/templates.py
new file mode 100644
index 000000000..5e259234d
--- /dev/null
+++ b/apprise/utils/templates.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2024, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import re
+import json
+
+
+class TemplateType:
+    """
+    Defines the different template types we can perform parsing on
+    """
+    # RAW does nothing at all to the content being parsed
+    # data is taken at it's absolute value
+    RAW = 'raw'
+
+    # Data is presumed to be of type JSON and is therefore escaped
+    # if required to do so (such as single quotes)
+    JSON = 'json'
+
+
+def apply_template(template, app_mode=TemplateType.RAW, **kwargs):
+    """
+    Takes a template in a str format and applies all of the keywords
+    and their values to it.
+
+    The app$mode is used to dictact any pre-processing that needs to take place
+    to the escaped string prior to it being placed.  The idea here is for
+    elements to be placed in a JSON response for example should be escaped
+    early in their string format.
+
+    The template must contain keywords wrapped in in double
+    squirly braces like {{keyword}}.  These are matched to the respected
+    kwargs passed into this function.
+
+    If there is no match found, content is not swapped.
+
+    """
+
+    def _escape_raw(content):
+        # No escaping necessary
+        return content
+
+    def _escape_json(content):
+        # remove surounding quotes
+        return json.dumps(content)[1:-1]
+
+    # Our escape function
+    fn = _escape_json if app_mode == TemplateType.JSON else _escape_raw
+
+    lookup = [re.escape(x) for x in kwargs.keys()]
+
+    # Compile this into a list
+    mask_r = re.compile(
+        re.escape('{{') + r'\s*(' + '|'.join(lookup) + r')\s*'
+        + re.escape('}}'), re.IGNORECASE)
+
+    # we index 2 characters off the head and 2 characters from the tail
+    # to drop the '{{' and '}}' surrounding our match so that we can
+    # re-index it back into our list
+    return mask_r.sub(lambda x: fn(kwargs[x.group()[2:-2].strip()]), template)
diff --git a/test/test_api.py b/test/test_api.py
index 2c7fa4b38..3770d6264 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -52,7 +52,7 @@
 from apprise.locale import gettext_lazy as _
 
 from apprise import NotificationManager
-from apprise.utils import parse_list
+from apprise.utils.parse import parse_list
 from helpers import OuterEventLoop
 import inspect
 
diff --git a/test/test_apprise_utils.py b/test/test_apprise_utils.py
index 0e1f4e317..75920d062 100644
--- a/test/test_apprise_utils.py
+++ b/test/test_apprise_utils.py
@@ -50,7 +50,7 @@
 def test_parse_qsd():
     "utils: parse_qsd() testing """
 
-    result = utils.parse_qsd('a=1&b=&c&d=abcd')
+    result = utils.parse.parse_qsd('a=1&b=&c&d=abcd')
     assert isinstance(result, dict)
     assert len(result) == 4
     assert 'qsd' in result
@@ -72,7 +72,7 @@ def test_parse_qsd():
 def test_parse_url_general():
     "utils: parse_url() testing """
 
-    result = utils.parse_url('http://hostname')
+    result = utils.parse.parse_url('http://hostname')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -88,7 +88,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # GitHub Ticket 1234 - Unparseable Hostname
-    result = utils.parse_url('http://5t4m59hl-34343.euw.devtunnels.ms')
+    result = utils.parse.parse_url('http://5t4m59hl-34343.euw.devtunnels.ms')
     assert result['schema'] == 'http'
     assert result['host'] == '5t4m59hl-34343.euw.devtunnels.ms'
     assert result['port'] is None
@@ -103,7 +103,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('http://hostname/')
+    result = utils.parse.parse_url('http://hostname/')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -119,10 +119,10 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # colon after hostname without port number is no good
-    assert utils.parse_url('http://hostname:') is None
+    assert utils.parse.parse_url('http://hostname:') is None
 
     # An invalid port
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid', verify_host=False, strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -139,7 +139,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # However if we don't verify the host, it is okay
-    result = utils.parse_url('http://hostname:', verify_host=False)
+    result = utils.parse.parse_url('http://hostname:', verify_host=False)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname:'
     assert result['port'] is None
@@ -155,10 +155,10 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # A port of Zero is not valid with strict port checking
-    assert utils.parse_url('http://hostname:0', strict_port=True) is None
+    assert utils.parse.parse_url('http://hostname:0', strict_port=True) is None
 
     # Without strict port checking however, it is okay
-    result = utils.parse_url('http://hostname:0', strict_port=False)
+    result = utils.parse.parse_url('http://hostname:0', strict_port=False)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] == 0
@@ -174,8 +174,9 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # A negative port is not valid
-    assert utils.parse_url('http://hostname:-92', strict_port=True) is None
-    result = utils.parse_url(
+    assert utils.parse.parse_url(
+        'http://hostname:-92', strict_port=True) is None
+    result = utils.parse.parse_url(
         'http://hostname:-92', verify_host=False, strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -192,10 +193,11 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # A port that is too large is not valid
-    assert utils.parse_url('http://hostname:65536', strict_port=True) is None
+    assert utils.parse.parse_url(
+        'http://hostname:65536', strict_port=True) is None
 
     # This is an accetable port (the maximum)
-    result = utils.parse_url('http://hostname:65535', strict_port=True)
+    result = utils.parse.parse_url('http://hostname:65535', strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] == 65535
@@ -211,7 +213,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # This is an accetable port (the maximum)
-    result = utils.parse_url('http://hostname:1', strict_port=True)
+    result = utils.parse.parse_url('http://hostname:1', strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] == 1
@@ -227,8 +229,9 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # A port that was identfied as a string is invalid
-    assert utils.parse_url('http://hostname:invalid', strict_port=True) is None
-    result = utils.parse_url(
+    assert utils.parse.parse_url(
+        'http://hostname:invalid', strict_port=True) is None
+    result = utils.parse.parse_url(
         'http://hostname:invalid', verify_host=False, strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -244,7 +247,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid', verify_host=False, strict_port=False)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname:invalid'
@@ -260,7 +263,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid?key=value&-minuskey=mvalue',
         verify_host=False, strict_port=False)
     assert result['schema'] == 'http'
@@ -279,8 +282,9 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # Handling of floats
-    assert utils.parse_url('http://hostname:4.2', strict_port=True) is None
-    result = utils.parse_url(
+    assert utils.parse.parse_url(
+        'http://hostname:4.2', strict_port=True) is None
+    result = utils.parse.parse_url(
         'http://hostname:4.2', verify_host=False, strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -297,10 +301,10 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # A Port of zero is not acceptable for a regular hostname
-    assert utils.parse_url('http://hostname:0', strict_port=True) is None
+    assert utils.parse.parse_url('http://hostname:0', strict_port=True) is None
 
     # No host verification (zero is an acceptable port when this is the case
-    result = utils.parse_url('http://hostname:0', verify_host=False)
+    result = utils.parse.parse_url('http://hostname:0', verify_host=False)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] == 0
@@ -315,7 +319,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://[2001:db8:002a:3256:adfe:05c0:0003:0006]:8080',
         verify_host=False)
     assert result['schema'] == 'http'
@@ -333,7 +337,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:0', verify_host=False, strict_port=True)
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -349,7 +353,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('http://hostname/?-KeY=Value')
+    result = utils.parse.parse_url('http://hostname/?-KeY=Value')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -366,7 +370,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('http://hostname/?+KeY=Value')
+    result = utils.parse.parse_url('http://hostname/?+KeY=Value')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -382,7 +386,7 @@ def test_parse_url_general():
     assert result['qsd-'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('http://hostname/?:kEy=vALUE')
+    result = utils.parse.parse_url('http://hostname/?:kEy=vALUE')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -398,7 +402,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd-'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname/?+KeY=ValueA&-kEy=ValueB&KEY=Value%20+C&:colon=y')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -422,7 +426,7 @@ def test_parse_url_general():
     assert result['qsd']['+key'] == result['qsd+']['KeY']
     assert result['qsd']['-key'] == result['qsd-']['kEy']
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname/?+KeY=ValueA&-kEy=ValueB&KEY=Value%20+C&:colon=y',
         plus_to_space=True)
     assert result['schema'] == 'http'
@@ -447,7 +451,7 @@ def test_parse_url_general():
     assert result['qsd']['+key'] == result['qsd+']['KeY']
     assert result['qsd']['-key'] == result['qsd-']['kEy']
 
-    result = utils.parse_url('http://hostname////')
+    result = utils.parse.parse_url('http://hostname////')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -462,7 +466,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('http://hostname:40////')
+    result = utils.parse.parse_url('http://hostname:40////')
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['port'] == 40
@@ -477,7 +481,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('HTTP://HoStNaMe:40/test.php')
+    result = utils.parse.parse_url('HTTP://HoStNaMe:40/test.php')
     assert result['schema'] == 'http'
     assert result['host'] == 'HoStNaMe'
     assert result['port'] == 40
@@ -492,7 +496,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('HTTPS://user@hostname/test.py')
+    result = utils.parse.parse_url('HTTPS://user@hostname/test.py')
     assert result['schema'] == 'https'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -507,7 +511,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('  HTTPS://///user@@@hostname///test.py  ')
+    result = utils.parse.parse_url('  HTTPS://///user@@@hostname///test.py  ')
     assert result['schema'] == 'https'
     assert result['host'] == 'hostname'
     assert result['port'] is None
@@ -522,7 +526,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'HTTPS://user:password@otherHost/full///path/name/',
     )
     assert result['schema'] == 'https'
@@ -539,7 +543,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'HTTPS://hostname/a/path/ending/with/slash/?key=value',
     )
     assert result['schema'] == 'https'
@@ -557,9 +561,9 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # Handle garbage
-    assert utils.parse_url(None) is None
+    assert utils.parse.parse_url(None) is None
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'mailto://user:password@otherHost/lead2gold@gmail.com' +
         '?from=test@test.com&name=Chris%20Caron&format=text'
     )
@@ -585,13 +589,13 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # Test Passwords with question marks ?; not supported
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://user:pass.with.?question@host'
     )
     assert result is None
 
     # just hostnames
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'nuxref.com'
     )
     assert result['schema'] == 'http'
@@ -609,7 +613,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # just host and path
-    result = utils.parse_url('invalid/host')
+    result = utils.parse.parse_url('invalid/host')
     assert result['schema'] == 'http'
     assert result['host'] == 'invalid'
     assert result['port'] is None
@@ -625,21 +629,21 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # just all out invalid
-    assert utils.parse_url('?') is None
-    assert utils.parse_url('/') is None
+    assert utils.parse.parse_url('?') is None
+    assert utils.parse.parse_url('/') is None
 
     # Test some illegal strings
-    result = utils.parse_url(object, verify_host=False)
+    result = utils.parse.parse_url(object, verify_host=False)
     assert result is None
-    result = utils.parse_url(None, verify_host=False)
+    result = utils.parse.parse_url(None, verify_host=False)
     assert result is None
 
     # Just a schema; invalid host
-    result = utils.parse_url('test://')
+    result = utils.parse.parse_url('test://')
     assert result is None
 
     # Do it again without host validation
-    result = utils.parse_url('test://', verify_host=False)
+    result = utils.parse.parse_url('test://', verify_host=False)
     assert result['schema'] == 'test'
     # It's worth noting that the hostname is an empty string and is NEVER set
     # to None if it wasn't specified.
@@ -656,7 +660,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('testhostname')
+    result = utils.parse.parse_url('testhostname')
     assert result['schema'] == 'http'
     assert result['host'] == 'testhostname'
     assert result['port'] is None
@@ -672,7 +676,7 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('example.com', default_schema='unknown')
+    result = utils.parse.parse_url('example.com', default_schema='unknown')
     assert result['schema'] == 'unknown'
     assert result['host'] == 'example.com'
     assert result['port'] is None
@@ -689,7 +693,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # An empty string without a hostame is still valid if verify_host is set
-    result = utils.parse_url('', verify_host=False)
+    result = utils.parse.parse_url('', verify_host=False)
     assert result['schema'] == 'http'
     assert result['host'] == ''
     assert result['port'] is None
@@ -706,7 +710,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # A messed up URL
-    result = utils.parse_url('test://:@/', verify_host=False)
+    result = utils.parse.parse_url('test://:@/', verify_host=False)
     assert result['schema'] == 'test'
     assert result['host'] == ''
     assert result['port'] is None
@@ -721,7 +725,8 @@ def test_parse_url_general():
     assert result['qsd+'] == {}
     assert result['qsd:'] == {}
 
-    result = utils.parse_url('crazy://:@//_/@^&/jack.json', verify_host=False)
+    result = utils.parse.parse_url(
+        'crazy://:@//_/@^&/jack.json', verify_host=False)
     assert result['schema'] == 'crazy'
     assert result['host'] == ''
     assert result['port'] is None
@@ -737,7 +742,7 @@ def test_parse_url_general():
     assert result['qsd:'] == {}
 
     # Sanitizing
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'hTTp://hostname/?+KeY=ValueA&-kEy=ValueB&KEY=Value%20+C&:cOlON=YeS',
         sanitize=False)
 
@@ -772,13 +777,13 @@ def test_parse_url_general():
 def test_parse_url_simple():
     "utils: parse_url() testing """
 
-    result = utils.parse_url('http://hostname', simple=True)
+    result = utils.parse.parse_url('http://hostname', simple=True)
     assert len(result) == 3
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
     assert result['url'] == 'http://hostname'
 
-    result = utils.parse_url('http://hostname/', simple=True)
+    result = utils.parse.parse_url('http://hostname/', simple=True)
     assert len(result) == 5
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -787,10 +792,10 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname/'
 
     # colon after hostname without port number is no good
-    assert utils.parse_url('http://hostname:', simple=True) is None
+    assert utils.parse.parse_url('http://hostname:', simple=True) is None
 
     # An invalid port
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid', verify_host=False, strict_port=True,
         simple=True)
     assert len(result) == 4
@@ -800,7 +805,7 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:invalid'
 
     # However if we don't verify the host, it is okay
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:', verify_host=False, simple=True)
     assert len(result) == 3
     assert result['schema'] == 'http'
@@ -808,11 +813,11 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:'
 
     # A port of Zero is not valid with strict port checking
-    assert utils.parse_url(
+    assert utils.parse.parse_url(
         'http://hostname:0', strict_port=True, simple=True) is None
 
     # Without strict port checking however, it is okay
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:0', strict_port=False, simple=True)
     assert len(result) == 4
     assert result['schema'] == 'http'
@@ -821,9 +826,9 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:0'
 
     # A negative port is not valid
-    assert utils.parse_url(
+    assert utils.parse.parse_url(
         'http://hostname:-92', strict_port=True, simple=True) is None
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:-92', verify_host=False, strict_port=True,
         simple=True)
     assert len(result) == 4
@@ -833,11 +838,11 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:-92'
 
     # A port that is too large is not valid
-    assert utils.parse_url(
+    assert utils.parse.parse_url(
         'http://hostname:65536', strict_port=True, simple=True) is None
 
     # This is an accetable port (the maximum)
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:65535', strict_port=True, simple=True)
     assert len(result) == 4
     assert result['schema'] == 'http'
@@ -846,7 +851,7 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:65535'
 
     # This is an accetable port (the maximum)
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:1', strict_port=True, simple=True)
     assert len(result) == 4
     assert result['schema'] == 'http'
@@ -855,9 +860,9 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:1'
 
     # A port that was identfied as a string is invalid
-    assert utils.parse_url(
+    assert utils.parse.parse_url(
         'http://hostname:invalid', strict_port=True, simple=True) is None
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid', verify_host=False, strict_port=True,
         simple=True)
     assert len(result) == 4
@@ -866,7 +871,7 @@ def test_parse_url_simple():
     assert result['port'] == 'invalid'
     assert result['url'] == 'http://hostname:invalid'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid', verify_host=False, strict_port=False,
         simple=True)
     assert len(result) == 3
@@ -874,7 +879,7 @@ def test_parse_url_simple():
     assert result['host'] == 'hostname:invalid'
     assert result['url'] == 'http://hostname:invalid'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:invalid?key=value&-minuskey=mvalue',
         verify_host=False, strict_port=False, simple=True)
     assert len(result) == 4
@@ -887,9 +892,9 @@ def test_parse_url_simple():
     assert unquote(result['qsd']['key']) == 'value'
 
     # Handling of floats
-    assert utils.parse_url(
+    assert utils.parse.parse_url(
         'http://hostname:4.2', strict_port=True, simple=True) is None
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:4.2', verify_host=False, strict_port=True,
         simple=True)
     assert len(result) == 4
@@ -899,11 +904,11 @@ def test_parse_url_simple():
     assert result['url'] == 'http://hostname:4.2'
 
     # A Port of zero is not acceptable for a regular hostname
-    assert utils.parse_url(
+    assert utils.parse.parse_url(
         'http://hostname:0', strict_port=True, simple=True) is None
 
     # No host verification (zero is an acceptable port when this is the case
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:0', verify_host=False, simple=True)
     assert len(result) == 4
     assert result['schema'] == 'http'
@@ -911,7 +916,7 @@ def test_parse_url_simple():
     assert result['port'] == 0
     assert result['url'] == 'http://hostname:0'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://[2001:db8:002a:3256:adfe:05c0:0003:0006]:8080',
         verify_host=False, simple=True)
     assert len(result) == 4
@@ -921,7 +926,7 @@ def test_parse_url_simple():
     assert result['url'] == \
         'http://[2001:db8:002a:3256:adfe:05c0:0003:0006]:8080'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname:0', verify_host=False, strict_port=True, simple=True)
     assert len(result) == 4
     assert result['schema'] == 'http'
@@ -929,7 +934,7 @@ def test_parse_url_simple():
     assert result['port'] == 0
     assert result['url'] == 'http://hostname:0'
 
-    result = utils.parse_url('http://hostname/?-KeY=Value', simple=True)
+    result = utils.parse.parse_url('http://hostname/?-KeY=Value', simple=True)
     assert len(result) == 6
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -939,7 +944,7 @@ def test_parse_url_simple():
     assert '-key' in result['qsd']
     assert unquote(result['qsd']['-key']) == 'Value'
 
-    result = utils.parse_url('http://hostname/?+KeY=Value', simple=True)
+    result = utils.parse.parse_url('http://hostname/?+KeY=Value', simple=True)
     assert len(result) == 6
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -949,7 +954,7 @@ def test_parse_url_simple():
     assert '+key' in result['qsd']
     assert result['qsd']['+key'] == 'Value'
 
-    result = utils.parse_url('http://hostname/?:kEy=vALUE', simple=True)
+    result = utils.parse.parse_url('http://hostname/?:kEy=vALUE', simple=True)
     assert len(result) == 6
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -959,7 +964,7 @@ def test_parse_url_simple():
     assert ':key' in result['qsd']
     assert result['qsd'][':key'] == 'vALUE'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://hostname/?+KeY=ValueA&-kEy=ValueB&KEY=Value%20+C&:colon=y',
         simple=True)
     assert len(result) == 6
@@ -976,7 +981,7 @@ def test_parse_url_simple():
     assert result['qsd']['+key'] == 'ValueA'
     assert result['qsd']['-key'] == 'ValueB'
 
-    result = utils.parse_url('http://hostname////', simple=True)
+    result = utils.parse.parse_url('http://hostname////', simple=True)
     assert len(result) == 5
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -984,7 +989,7 @@ def test_parse_url_simple():
     assert result['path'] == '/'
     assert result['url'] == 'http://hostname/'
 
-    result = utils.parse_url('http://hostname:40////', simple=True)
+    result = utils.parse.parse_url('http://hostname:40////', simple=True)
     assert len(result) == 6
     assert result['schema'] == 'http'
     assert result['host'] == 'hostname'
@@ -993,7 +998,7 @@ def test_parse_url_simple():
     assert result['path'] == '/'
     assert result['url'] == 'http://hostname:40/'
 
-    result = utils.parse_url('HTTP://HoStNaMe:40/test.php', simple=True)
+    result = utils.parse.parse_url('HTTP://HoStNaMe:40/test.php', simple=True)
     assert len(result) == 7
     assert result['schema'] == 'http'
     assert result['host'] == 'HoStNaMe'
@@ -1003,7 +1008,8 @@ def test_parse_url_simple():
     assert result['query'] == 'test.php'
     assert result['url'] == 'http://HoStNaMe:40/test.php'
 
-    result = utils.parse_url('HTTPS://user@hostname/test.py', simple=True)
+    result = utils.parse.parse_url(
+        'HTTPS://user@hostname/test.py', simple=True)
     assert len(result) == 7
     assert result['schema'] == 'https'
     assert result['host'] == 'hostname'
@@ -1013,7 +1019,7 @@ def test_parse_url_simple():
     assert result['query'] == 'test.py'
     assert result['url'] == 'https://user@hostname/test.py'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         '  HTTPS://///user@@@hostname///test.py  ', simple=True)
     assert len(result) == 7
     assert result['schema'] == 'https'
@@ -1024,7 +1030,7 @@ def test_parse_url_simple():
     assert result['query'] == 'test.py'
     assert result['url'] == 'https://user@hostname/test.py'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'HTTPS://user:password@otherHost/full///path/name/',
         simple=True,
     )
@@ -1038,9 +1044,9 @@ def test_parse_url_simple():
     assert result['url'] == 'https://user:password@otherHost/full/path/name/'
 
     # Handle garbage
-    assert utils.parse_url(None) is None
+    assert utils.parse.parse_url(None) is None
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'mailto://user:password@otherHost/lead2gold@gmail.com' +
         '?from=test@test.com&name=Chris%20Caron&format=text',
         simple=True,
@@ -1064,14 +1070,14 @@ def test_parse_url_simple():
     assert unquote(result['qsd']['format']) == 'text'
 
     # Test Passwords with question marks ?; not supported
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'http://user:pass.with.?question@host',
         simple=True
     )
     assert result is None
 
     # just hostnames
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'nuxref.com', simple=True,
     )
     assert len(result) == 3
@@ -1080,7 +1086,7 @@ def test_parse_url_simple():
     assert result['url'] == 'http://nuxref.com'
 
     # just host and path
-    result = utils.parse_url('invalid/host', simple=True)
+    result = utils.parse.parse_url('invalid/host', simple=True)
     assert len(result) == 6
     assert result['schema'] == 'http'
     assert result['host'] == 'invalid'
@@ -1090,33 +1096,33 @@ def test_parse_url_simple():
     assert result['url'] == 'http://invalid/host'
 
     # just all out invalid
-    assert utils.parse_url('?', simple=True) is None
-    assert utils.parse_url('/', simple=True) is None
+    assert utils.parse.parse_url('?', simple=True) is None
+    assert utils.parse.parse_url('/', simple=True) is None
 
     # Test some illegal strings
-    result = utils.parse_url(object, verify_host=False, simple=True)
+    result = utils.parse.parse_url(object, verify_host=False, simple=True)
     assert result is None
-    result = utils.parse_url(None, verify_host=False, simple=True)
+    result = utils.parse.parse_url(None, verify_host=False, simple=True)
     assert result is None
 
     # Just a schema; invalid host
-    result = utils.parse_url('test://', simple=True)
+    result = utils.parse.parse_url('test://', simple=True)
     assert result is None
 
     # Do it again without host validation
-    result = utils.parse_url('test://', verify_host=False, simple=True)
+    result = utils.parse.parse_url('test://', verify_host=False, simple=True)
     assert len(result) == 2
     assert result['schema'] == 'test'
     assert result['url'] == 'test://'
 
-    result = utils.parse_url('testhostname', simple=True)
+    result = utils.parse.parse_url('testhostname', simple=True)
     assert len(result) == 3
     assert result['schema'] == 'http'
     assert result['host'] == 'testhostname'
     # The default_schema kicks in here
     assert result['url'] == 'http://testhostname'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'example.com', default_schema='unknown', simple=True)
     assert len(result) == 3
     assert result['schema'] == 'unknown'
@@ -1125,14 +1131,15 @@ def test_parse_url_simple():
     assert result['url'] == 'unknown://example.com'
 
     # An empty string without a hostame is still valid if verify_host is set
-    result = utils.parse_url('', verify_host=False, simple=True)
+    result = utils.parse.parse_url('', verify_host=False, simple=True)
     assert len(result) == 2
     assert result['schema'] == 'http'
     # The default_schema kicks in here
     assert result['url'] == 'http://'
 
     # A messed up URL
-    result = utils.parse_url('test://:@/', verify_host=False, simple=True)
+    result = utils.parse.parse_url(
+        'test://:@/', verify_host=False, simple=True)
     assert len(result) == 6
     assert result['schema'] == 'test'
     assert result['user'] == ''
@@ -1141,7 +1148,7 @@ def test_parse_url_simple():
     assert result['path'] == '/'
     assert result['url'] == 'test://:@/'
 
-    result = utils.parse_url(
+    result = utils.parse.parse_url(
         'crazy://:@//_/@^&/jack.json', verify_host=False, simple=True)
     assert len(result) == 7
     assert result['schema'] == 'crazy'
@@ -1158,58 +1165,62 @@ def test_url_assembly():
     "utils: url_assembly() testing """
 
     url = 'schema://user:password@hostname:port/path/?key=value'
-    assert utils.url_assembly(**utils.parse_url(url, verify_host=False)) == url
+    assert utils.parse.url_assembly(
+        **utils.parse.parse_url(url, verify_host=False)) == url
 
     # Same URL without trailing slash after path
     url = 'schema://user:password@hostname:port/path?key=value'
-    assert utils.url_assembly(**utils.parse_url(url, verify_host=False)) == url
+    assert utils.parse.url_assembly(
+        **utils.parse.parse_url(url, verify_host=False)) == url
 
     url = 'schema://user@hostname:port/path?key=value'
-    assert utils.url_assembly(**utils.parse_url(url, verify_host=False)) == url
+    assert utils.parse.url_assembly(
+        **utils.parse.parse_url(url, verify_host=False)) == url
 
     url = 'schema://hostname:10/a/file.php'
-    assert utils.url_assembly(**utils.parse_url(url, verify_host=False)) == url
+    assert utils.parse.url_assembly(
+        **utils.parse.parse_url(url, verify_host=False)) == url
 
 
 def test_parse_bool():
     "utils: parse_bool() testing """
 
-    assert utils.parse_bool('Enabled', None) is True
-    assert utils.parse_bool('Disabled', None) is False
-    assert utils.parse_bool('Allow', None) is True
-    assert utils.parse_bool('Deny', None) is False
-    assert utils.parse_bool('Yes', None) is True
-    assert utils.parse_bool('YES', None) is True
-    assert utils.parse_bool('Always', None) is True
-    assert utils.parse_bool('No', None) is False
-    assert utils.parse_bool('NO', None) is False
-    assert utils.parse_bool('NEVER', None) is False
-    assert utils.parse_bool('TrUE', None) is True
-    assert utils.parse_bool('tRUe', None) is True
-    assert utils.parse_bool('FAlse', None) is False
-    assert utils.parse_bool('F', None) is False
-    assert utils.parse_bool('T', None) is True
-    assert utils.parse_bool('0', None) is False
-    assert utils.parse_bool('1', None) is True
-    assert utils.parse_bool('True', None) is True
-    assert utils.parse_bool('Yes', None) is True
-    assert utils.parse_bool(1, None) is True
-    assert utils.parse_bool(0, None) is False
-    assert utils.parse_bool(True, None) is True
-    assert utils.parse_bool(False, None) is False
+    assert utils.parse.parse_bool('Enabled', None) is True
+    assert utils.parse.parse_bool('Disabled', None) is False
+    assert utils.parse.parse_bool('Allow', None) is True
+    assert utils.parse.parse_bool('Deny', None) is False
+    assert utils.parse.parse_bool('Yes', None) is True
+    assert utils.parse.parse_bool('YES', None) is True
+    assert utils.parse.parse_bool('Always', None) is True
+    assert utils.parse.parse_bool('No', None) is False
+    assert utils.parse.parse_bool('NO', None) is False
+    assert utils.parse.parse_bool('NEVER', None) is False
+    assert utils.parse.parse_bool('TrUE', None) is True
+    assert utils.parse.parse_bool('tRUe', None) is True
+    assert utils.parse.parse_bool('FAlse', None) is False
+    assert utils.parse.parse_bool('F', None) is False
+    assert utils.parse.parse_bool('T', None) is True
+    assert utils.parse.parse_bool('0', None) is False
+    assert utils.parse.parse_bool('1', None) is True
+    assert utils.parse.parse_bool('True', None) is True
+    assert utils.parse.parse_bool('Yes', None) is True
+    assert utils.parse.parse_bool(1, None) is True
+    assert utils.parse.parse_bool(0, None) is False
+    assert utils.parse.parse_bool(True, None) is True
+    assert utils.parse.parse_bool(False, None) is False
 
     # only the int of 0 will return False since the function
     # casts this to a boolean
-    assert utils.parse_bool(2, None) is True
+    assert utils.parse.parse_bool(2, None) is True
     # An empty list is still false
-    assert utils.parse_bool([], None) is False
+    assert utils.parse.parse_bool([], None) is False
     # But a list that contains something is True
-    assert utils.parse_bool(['value', ], None) is True
+    assert utils.parse.parse_bool(['value', ], None) is True
 
     # Use Default (which is False)
-    assert utils.parse_bool('OhYeah') is False
+    assert utils.parse.parse_bool('OhYeah') is False
     # Adjust Default and get a different result
-    assert utils.parse_bool('OhYeah', True) is True
+    assert utils.parse.parse_bool('OhYeah', True) is True
 
 
 def test_is_uuid():
@@ -1217,18 +1228,18 @@ def test_is_uuid():
     API: is_uuid() function
     """
     # Invalid Entries
-    assert utils.is_uuid('invalid') is False
-    assert utils.is_uuid(None) is False
-    assert utils.is_uuid(5) is False
-    assert utils.is_uuid(object) is False
+    assert utils.parse.is_uuid('invalid') is False
+    assert utils.parse.is_uuid(None) is False
+    assert utils.parse.is_uuid(5) is False
+    assert utils.parse.is_uuid(object) is False
 
     # A slightly invalid uuid4 entry
-    assert utils.is_uuid('591ed387-fa65-ac97-9712-b9d2a15e42a9') is False
-    assert utils.is_uuid('591ed387-fa65-Jc97-9712-b9d2a15e42a9') is False
+    assert utils.parse.is_uuid('591ed387-fa65-ac97-9712-b9d2a15e42a9') is False
+    assert utils.parse.is_uuid('591ed387-fa65-Jc97-9712-b9d2a15e42a9') is False
 
     # Valid UUID4 Entries
-    assert utils.is_uuid('591ed387-fa65-4c97-9712-b9d2a15e42a9') is True
-    assert utils.is_uuid('32b0b447-fe84-4df1-8368-81925e729265') is True
+    assert utils.parse.is_uuid('591ed387-fa65-4c97-9712-b9d2a15e42a9') is True
+    assert utils.parse.is_uuid('32b0b447-fe84-4df1-8368-81925e729265') is True
 
 
 def test_is_hostname():
@@ -1237,66 +1248,70 @@ def test_is_hostname():
 
     """
     # Valid Hostnames
-    assert utils.is_hostname('yahoo.ca') == 'yahoo.ca'
-    assert utils.is_hostname('yahoo.ca.') == 'yahoo.ca'
-    assert utils.is_hostname('valid-dashes-in-host.ca') == \
+    assert utils.parse.is_hostname('yahoo.ca') == 'yahoo.ca'
+    assert utils.parse.is_hostname('yahoo.ca.') == 'yahoo.ca'
+    assert utils.parse.is_hostname('valid-dashes-in-host.ca') == \
         'valid-dashes-in-host.ca'
-    assert utils.is_hostname('valid-underscores_in_host.ca') == \
+    assert utils.parse.is_hostname('valid-underscores_in_host.ca') == \
         'valid-underscores_in_host.ca'
 
     # Underscores are supported by default
-    assert utils.is_hostname('valid_dashes_in_host.ca') == \
+    assert utils.parse.is_hostname('valid_dashes_in_host.ca') == \
         'valid_dashes_in_host.ca'
     # However they are not if specified otherwise:
-    assert utils.is_hostname(
+    assert utils.parse.is_hostname(
         'valid_dashes_in_host.ca', underscore=False) is False
 
     # Invalid Hostnames
-    assert utils.is_hostname('-hostname.that.starts.with.a.dash') is False
-    assert utils.is_hostname('invalid-characters_#^.ca') is False
-    assert utils.is_hostname('    spaces   ') is False
-    assert utils.is_hostname('       ') is False
-    assert utils.is_hostname('') is False
+    assert utils.parse.is_hostname(
+        '-hostname.that.starts.with.a.dash') is False
+    assert utils.parse.is_hostname('invalid-characters_#^.ca') is False
+    assert utils.parse.is_hostname('    spaces   ') is False
+    assert utils.parse.is_hostname('       ') is False
+    assert utils.parse.is_hostname('') is False
 
     # Valid IPv4 Addresses
-    assert utils.is_hostname('127.0.0.1') == '127.0.0.1'
-    assert utils.is_hostname('0.0.0.0') == '0.0.0.0'
-    assert utils.is_hostname('255.255.255.255') == '255.255.255.255'
+    assert utils.parse.is_hostname('127.0.0.1') == '127.0.0.1'
+    assert utils.parse.is_hostname('0.0.0.0') == '0.0.0.0'
+    assert utils.parse.is_hostname('255.255.255.255') == '255.255.255.255'
 
     # But not if we're not checking for this:
-    assert utils.is_hostname('127.0.0.1', ipv4=False) is False
-    assert utils.is_hostname('0.0.0.0', ipv4=False) is False
-    assert utils.is_hostname('255.255.255.255', ipv4=False) is False
+    assert utils.parse.is_hostname('127.0.0.1', ipv4=False) is False
+    assert utils.parse.is_hostname('0.0.0.0', ipv4=False) is False
+    assert utils.parse.is_hostname('255.255.255.255', ipv4=False) is False
 
     # Invalid IPv4 Addresses
-    assert utils.is_hostname('1.2.3') is False
-    assert utils.is_hostname('256.256.256.256') is False
-    assert utils.is_hostname('999.0.0.0') is False
-    assert utils.is_hostname('1.2.3.4.5') is False
-    assert utils.is_hostname('    127.0.0.1   ') is False
-    assert utils.is_hostname('       ') is False
-    assert utils.is_hostname('') is False
+    assert utils.parse.is_hostname('1.2.3') is False
+    assert utils.parse.is_hostname('256.256.256.256') is False
+    assert utils.parse.is_hostname('999.0.0.0') is False
+    assert utils.parse.is_hostname('1.2.3.4.5') is False
+    assert utils.parse.is_hostname('    127.0.0.1   ') is False
+    assert utils.parse.is_hostname('       ') is False
+    assert utils.parse.is_hostname('') is False
 
     # Valid IPv6 Addresses (square brakets supported for URL construction)
-    assert utils.is_hostname('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]') == \
+    assert utils.parse.is_hostname(
+        '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]') == \
         '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]'
-    assert utils.is_hostname('2001:0db8:85a3:0000:0000:8a2e:0370:7334') == \
+    assert utils.parse.is_hostname(
+        '2001:0db8:85a3:0000:0000:8a2e:0370:7334') == \
         '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]'
-    assert utils.is_hostname('[2001:db8:002a:3256:adfe:05c0:0003:0006]') == \
+    assert utils.parse.is_hostname(
+        '[2001:db8:002a:3256:adfe:05c0:0003:0006]') == \
         '[2001:db8:002a:3256:adfe:05c0:0003:0006]'
 
     # localhost
-    assert utils.is_hostname('::1') == '[::1]'
-    assert utils.is_hostname('0:0:0:0:0:0:0:1') == '[0:0:0:0:0:0:0:1]'
+    assert utils.parse.is_hostname('::1') == '[::1]'
+    assert utils.parse.is_hostname('0:0:0:0:0:0:0:1') == '[0:0:0:0:0:0:0:1]'
 
     # But not if we're not checking for this:
-    assert utils.is_hostname(
+    assert utils.parse.is_hostname(
         '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]', ipv6=False) is False
-    assert utils.is_hostname(
+    assert utils.parse.is_hostname(
         '2001:0db8:85a3:0000:0000:8a2e:0370:7334', ipv6=False) is False
 
     # Test hostnames with a single character hostname
-    assert utils.is_hostname(
+    assert utils.parse.is_hostname(
         'cloud.a.example.com', ipv4=False, ipv6=False) == 'cloud.a.example.com'
 
 
@@ -1306,30 +1321,33 @@ def test_is_ipaddr():
 
     """
     # Valid IPv4 Addresses
-    assert utils.is_ipaddr('127.0.0.1') == '127.0.0.1'
-    assert utils.is_ipaddr('0.0.0.0') == '0.0.0.0'
-    assert utils.is_ipaddr('255.255.255.255') == '255.255.255.255'
+    assert utils.parse.is_ipaddr('127.0.0.1') == '127.0.0.1'
+    assert utils.parse.is_ipaddr('0.0.0.0') == '0.0.0.0'
+    assert utils.parse.is_ipaddr('255.255.255.255') == '255.255.255.255'
 
     # Invalid IPv4 Addresses
-    assert utils.is_ipaddr('1.2.3') is False
-    assert utils.is_ipaddr('256.256.256.256') is False
-    assert utils.is_ipaddr('999.0.0.0') is False
-    assert utils.is_ipaddr('1.2.3.4.5') is False
-    assert utils.is_ipaddr('    127.0.0.1   ') is False
-    assert utils.is_ipaddr('       ') is False
-    assert utils.is_ipaddr('') is False
+    assert utils.parse.is_ipaddr('1.2.3') is False
+    assert utils.parse.is_ipaddr('256.256.256.256') is False
+    assert utils.parse.is_ipaddr('999.0.0.0') is False
+    assert utils.parse.is_ipaddr('1.2.3.4.5') is False
+    assert utils.parse.is_ipaddr('    127.0.0.1   ') is False
+    assert utils.parse.is_ipaddr('       ') is False
+    assert utils.parse.is_ipaddr('') is False
 
     # Valid IPv6 Addresses (square brakets supported for URL construction)
-    assert utils.is_ipaddr('[2001:0db8:85a3:0000:0000:8a2e:0370:7334]') == \
+    assert utils.parse.is_ipaddr(
+        '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]') == \
         '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]'
-    assert utils.is_ipaddr('2001:0db8:85a3:0000:0000:8a2e:0370:7334') == \
+    assert utils.parse.is_ipaddr(
+        '2001:0db8:85a3:0000:0000:8a2e:0370:7334') == \
         '[2001:0db8:85a3:0000:0000:8a2e:0370:7334]'
-    assert utils.is_ipaddr('[2001:db8:002a:3256:adfe:05c0:0003:0006]') == \
+    assert utils.parse.is_ipaddr(
+        '[2001:db8:002a:3256:adfe:05c0:0003:0006]') == \
         '[2001:db8:002a:3256:adfe:05c0:0003:0006]'
 
     # localhost
-    assert utils.is_ipaddr('::1') == '[::1]'
-    assert utils.is_ipaddr('0:0:0:0:0:0:0:1') == '[0:0:0:0:0:0:0:1]'
+    assert utils.parse.is_ipaddr('::1') == '[::1]'
+    assert utils.parse.is_ipaddr('0:0:0:0:0:0:0:1') == '[0:0:0:0:0:0:0:1]'
 
 
 def test_is_email():
@@ -1338,7 +1356,7 @@ def test_is_email():
 
     """
     # Valid Emails
-    results = utils.is_email('test@gmail.com')
+    results = utils.parse.is_email('test@gmail.com')
     assert '' == results['name']
     assert 'test@gmail.com' == results['email']
     assert 'test@gmail.com' == results['full_email']
@@ -1346,7 +1364,7 @@ def test_is_email():
     assert 'test' == results['user']
     assert '' == results['label']
 
-    results = utils.is_email('test@my-valid_host.com')
+    results = utils.parse.is_email('test@my-valid_host.com')
     assert '' == results['name']
     assert 'test@my-valid_host.com' == results['email']
     assert 'test@my-valid_host.com' == results['full_email']
@@ -1354,7 +1372,7 @@ def test_is_email():
     assert 'test' == results['user']
     assert '' == results['label']
 
-    results = utils.is_email('tag+test@gmail.com')
+    results = utils.parse.is_email('tag+test@gmail.com')
     assert '' == results['name']
     assert 'test@gmail.com' == results['email']
     assert 'tag+test@gmail.com' == results['full_email']
@@ -1363,7 +1381,7 @@ def test_is_email():
     assert 'tag' == results['label']
 
     # Support Full Names as well
-    results = utils.is_email('Bill Gates: bgates@microsoft.com')
+    results = utils.parse.is_email('Bill Gates: bgates@microsoft.com')
     assert 'Bill Gates' == results['name']
     assert 'bgates@microsoft.com' == results['email']
     assert 'bgates@microsoft.com' == results['full_email']
@@ -1371,7 +1389,7 @@ def test_is_email():
     assert 'bgates' == results['user']
     assert '' == results['label']
 
-    results = utils.is_email('Bill Gates <bgates@microsoft.com>')
+    results = utils.parse.is_email('Bill Gates <bgates@microsoft.com>')
     assert 'Bill Gates' == results['name']
     assert 'bgates@microsoft.com' == results['email']
     assert 'bgates@microsoft.com' == results['full_email']
@@ -1379,7 +1397,7 @@ def test_is_email():
     assert 'bgates' == results['user']
     assert '' == results['label']
 
-    results = utils.is_email('Bill Gates: <bgates@microsoft.com>')
+    results = utils.parse.is_email('Bill Gates: <bgates@microsoft.com>')
     assert 'Bill Gates' == results['name']
     assert 'bgates@microsoft.com' == results['email']
     assert 'bgates@microsoft.com' == results['full_email']
@@ -1387,7 +1405,7 @@ def test_is_email():
     assert 'bgates' == results['user']
     assert '' == results['label']
 
-    results = utils.is_email('Sundar Pichai <ceo+spichai@gmail.com>')
+    results = utils.parse.is_email('Sundar Pichai <ceo+spichai@gmail.com>')
     assert 'Sundar Pichai' == results['name']
     assert 'spichai@gmail.com' == results['email']
     assert 'ceo+spichai@gmail.com' == results['full_email']
@@ -1396,7 +1414,7 @@ def test_is_email():
     assert 'ceo' == results['label']
 
     # Support Quotes
-    results = utils.is_email('"Chris Hemsworth" <ch@test.com>')
+    results = utils.parse.is_email('"Chris Hemsworth" <ch@test.com>')
     assert 'Chris Hemsworth' == results['name']
     assert 'ch@test.com' == results['email']
     assert 'ch@test.com' == results['full_email']
@@ -1405,7 +1423,7 @@ def test_is_email():
     assert '' == results['label']
 
     # An email without name, but contains delimiters
-    results = utils.is_email('      <spichai@gmail.com>')
+    results = utils.parse.is_email('      <spichai@gmail.com>')
     assert '' == results['name']
     assert 'spichai@gmail.com' == results['email']
     assert 'spichai@gmail.com' == results['full_email']
@@ -1415,7 +1433,7 @@ def test_is_email():
 
     # a valid email not properly delimited with a colon or angle bracket
     # We do a best guess and still parse it correctly
-    results = utils.is_email("Name valid@example.com")
+    results = utils.parse.is_email("Name valid@example.com")
     assert 'Name' == results['name']
     assert 'valid@example.com' == results['email']
     assert 'valid@example.com' == results['full_email']
@@ -1425,7 +1443,7 @@ def test_is_email():
 
     # a valid email not properly delimited with a colon or angle bracket
     # We do a best guess and still parse it correctly
-    results = utils.is_email("Руслан Эра russian+russia@example.ru")
+    results = utils.parse.is_email("Руслан Эра russian+russia@example.ru")
     assert 'Руслан Эра' == results['name']
     assert 'russia@example.ru' == results['email']
     assert 'russian+russia@example.ru' == results['full_email']
@@ -1434,17 +1452,17 @@ def test_is_email():
     assert 'russian' == results['label']
 
     # Invalid Emails
-    assert utils.is_email('invalid.com') is False
-    assert utils.is_email(object()) is False
-    assert utils.is_email(None) is False
-    assert utils.is_email("Just A Name") is False
-    assert utils.is_email("Name <bademail>") is False
+    assert utils.parse.is_email('invalid.com') is False
+    assert utils.parse.is_email(object()) is False
+    assert utils.parse.is_email(None) is False
+    assert utils.parse.is_email("Just A Name") is False
+    assert utils.parse.is_email("Name <bademail>") is False
 
     # Extended valid emails
     #
     # The first + denotes our label, so this test really validates
     # that there is a correct split and parsing of our email
-    results = utils.is_email('a-z0-9_!#$%&*+/=?%`{|}~^.-@gmail.com')
+    results = utils.parse.is_email('a-z0-9_!#$%&*+/=?%`{|}~^.-@gmail.com')
     assert '' == results['name']
     assert 'a-z0-9_!#$%&*' == results['label']
     assert '/=?%`{|}~^.-@gmail.com' == results['email']
@@ -1456,7 +1474,7 @@ def test_is_email():
 
     # The first + denotes our label, so this test really validates
     # that there is a correct split and parsing of our email
-    results = utils.is_email('a-z0-9_!#$%&*/=?%`{|}~^.-@gmail.com')
+    results = utils.parse.is_email('a-z0-9_!#$%&*/=?%`{|}~^.-@gmail.com')
     assert '' == results['name']
     assert '' == results['label']
     assert 'a-z0-9_!#$%&*/=?%`{|}~^.-@gmail.com' == results['email']
@@ -1471,34 +1489,34 @@ def test_is_call_sign_no():
 
     """
     # Invalid numbers
-    assert utils.is_call_sign(None) is False
-    assert utils.is_call_sign(42) is False
-    assert utils.is_call_sign(object) is False
-    assert utils.is_call_sign('') is False
-    assert utils.is_call_sign('1') is False
-    assert utils.is_call_sign('12') is False
-    assert utils.is_call_sign('abc') is False
-    assert utils.is_call_sign('+()') is False
-    assert utils.is_call_sign('+') is False
-    assert utils.is_call_sign(None) is False
-    assert utils.is_call_sign(42) is False
+    assert utils.parse.is_call_sign(None) is False
+    assert utils.parse.is_call_sign(42) is False
+    assert utils.parse.is_call_sign(object) is False
+    assert utils.parse.is_call_sign('') is False
+    assert utils.parse.is_call_sign('1') is False
+    assert utils.parse.is_call_sign('12') is False
+    assert utils.parse.is_call_sign('abc') is False
+    assert utils.parse.is_call_sign('+()') is False
+    assert utils.parse.is_call_sign('+') is False
+    assert utils.parse.is_call_sign(None) is False
+    assert utils.parse.is_call_sign(42) is False
 
     # To short or 2 long
-    assert utils.is_call_sign('DF1AB') is False
-    assert utils.is_call_sign('DF1ABCX') is False
-    assert utils.is_call_sign('DF1ABCEFG') is False
-    assert utils.is_call_sign('1ABCX') is False
+    assert utils.parse.is_call_sign('DF1AB') is False
+    assert utils.parse.is_call_sign('DF1ABCX') is False
+    assert utils.parse.is_call_sign('DF1ABCEFG') is False
+    assert utils.parse.is_call_sign('1ABCX') is False
     # 4th character is not an number
-    assert utils.is_call_sign('XXXXXX') is False
+    assert utils.parse.is_call_sign('XXXXXX') is False
 
     # Some valid checks
-    result = utils.is_call_sign('DF1ABC')
+    result = utils.parse.is_call_sign('DF1ABC')
     assert isinstance(result, dict)
     assert 'DF1ABC' == result['callsign']
     assert '' == result['ssid']
 
     # Get our SSID
-    result = utils.is_call_sign('DF1ABC-14')
+    result = utils.parse.is_call_sign('DF1ABC-14')
     assert 'DF1ABC' == result['callsign']
     assert '-14' == result['ssid']
 
@@ -1509,24 +1527,24 @@ def test_is_phone_no():
 
     """
     # Invalid numbers
-    assert utils.is_phone_no(None) is False
-    assert utils.is_phone_no(42) is False
-    assert utils.is_phone_no(object) is False
-    assert utils.is_phone_no('') is False
-    assert utils.is_phone_no('1') is False
-    assert utils.is_phone_no('12') is False
-    assert utils.is_phone_no('abc') is False
-    assert utils.is_phone_no('+()') is False
-    assert utils.is_phone_no('+') is False
-    assert utils.is_phone_no(None) is False
-    assert utils.is_phone_no(42) is False
-    assert utils.is_phone_no(object, min_len=0) is False
-    assert utils.is_phone_no('', min_len=1) is False
-    assert utils.is_phone_no('abc', min_len=0) is False
-    assert utils.is_phone_no('', min_len=0) is False
+    assert utils.parse.is_phone_no(None) is False
+    assert utils.parse.is_phone_no(42) is False
+    assert utils.parse.is_phone_no(object) is False
+    assert utils.parse.is_phone_no('') is False
+    assert utils.parse.is_phone_no('1') is False
+    assert utils.parse.is_phone_no('12') is False
+    assert utils.parse.is_phone_no('abc') is False
+    assert utils.parse.is_phone_no('+()') is False
+    assert utils.parse.is_phone_no('+') is False
+    assert utils.parse.is_phone_no(None) is False
+    assert utils.parse.is_phone_no(42) is False
+    assert utils.parse.is_phone_no(object, min_len=0) is False
+    assert utils.parse.is_phone_no('', min_len=1) is False
+    assert utils.parse.is_phone_no('abc', min_len=0) is False
+    assert utils.parse.is_phone_no('', min_len=0) is False
 
     # Ambigious, but will document it here in this test as such
-    results = utils.is_phone_no('+((()))--+', min_len=0)
+    results = utils.parse.is_phone_no('+((()))--+', min_len=0)
     assert '' == results['country']
     assert '' == results['area']
     assert '' == results['line']
@@ -1534,32 +1552,32 @@ def test_is_phone_no():
     assert '' == results['full']
 
     # Valid phone numbers
-    assert utils.is_phone_no('+(0)') is False
-    results = utils.is_phone_no('+(0)', min_len=1)
+    assert utils.parse.is_phone_no('+(0)') is False
+    results = utils.parse.is_phone_no('+(0)', min_len=1)
     assert '' == results['country']
     assert '' == results['area']
     assert '0' == results['line']
     assert '0' == results['pretty']
     assert '0' == results['full']
 
-    assert utils.is_phone_no('1') is False
-    results = utils.is_phone_no('1', min_len=1)
+    assert utils.parse.is_phone_no('1') is False
+    results = utils.parse.is_phone_no('1', min_len=1)
     assert '' == results['country']
     assert '' == results['area']
     assert '1' == results['line']
     assert '1' == results['pretty']
     assert '1' == results['full']
 
-    assert utils.is_phone_no('12') is False
-    results = utils.is_phone_no('12', min_len=2)
+    assert utils.parse.is_phone_no('12') is False
+    results = utils.parse.is_phone_no('12', min_len=2)
     assert '' == results['country']
     assert '' == results['area']
     assert '12' == results['line']
     assert '12' == results['pretty']
     assert '12' == results['full']
 
-    assert utils.is_phone_no('911') is False
-    results = utils.is_phone_no('911', min_len=3)
+    assert utils.parse.is_phone_no('911') is False
+    results = utils.parse.is_phone_no('911', min_len=3)
     assert isinstance(results, dict)
     assert '' == results['country']
     assert '' == results['area']
@@ -1567,8 +1585,8 @@ def test_is_phone_no():
     assert '911' == results['pretty']
     assert '911' == results['full']
 
-    assert utils.is_phone_no('1234') is False
-    results = utils.is_phone_no('1234', min_len=4)
+    assert utils.parse.is_phone_no('1234') is False
+    results = utils.parse.is_phone_no('1234', min_len=4)
     assert isinstance(results, dict)
     assert '' == results['country']
     assert '' == results['area']
@@ -1576,8 +1594,8 @@ def test_is_phone_no():
     assert '1234' == results['pretty']
     assert '1234' == results['full']
 
-    assert utils.is_phone_no('12345') is False
-    results = utils.is_phone_no('12345', min_len=5)
+    assert utils.parse.is_phone_no('12345') is False
+    results = utils.parse.is_phone_no('12345', min_len=5)
     assert isinstance(results, dict)
     assert '' == results['country']
     assert '' == results['area']
@@ -1585,8 +1603,8 @@ def test_is_phone_no():
     assert '12345' == results['pretty']
     assert '12345' == results['full']
 
-    assert utils.is_phone_no('123456') is False
-    results = utils.is_phone_no('123456', min_len=6)
+    assert utils.parse.is_phone_no('123456') is False
+    results = utils.parse.is_phone_no('123456', min_len=6)
     assert isinstance(results, dict)
     assert '' == results['country']
     assert '' == results['area']
@@ -1595,8 +1613,8 @@ def test_is_phone_no():
     assert '123456' == results['full']
 
     # at 7 digits, the format hyphenates in the `pretty` section
-    assert utils.is_phone_no('1234567') is False
-    results = utils.is_phone_no('1234567', min_len=7)
+    assert utils.parse.is_phone_no('1234567') is False
+    results = utils.parse.is_phone_no('1234567', min_len=7)
     assert isinstance(results, dict)
     assert '' == results['country']
     assert '' == results['area']
@@ -1604,7 +1622,7 @@ def test_is_phone_no():
     assert '123-4567' == results['pretty']
     assert '1234567' == results['full']
 
-    results = utils.is_phone_no('1(800) 123-4567')
+    results = utils.parse.is_phone_no('1(800) 123-4567')
     assert isinstance(results, dict)
     assert '1' == results['country']
     assert '800' == results['area']
@@ -1616,39 +1634,41 @@ def test_is_phone_no():
 def test_parse_call_sign():
     """utils: parse_call_sign() testing """
     # A simple single array entry (As str)
-    results = utils.parse_call_sign('')
+    results = utils.parse.parse_call_sign('')
     assert isinstance(results, list)
     assert len(results) == 0
 
     # just delimeters
-    results = utils.parse_call_sign(',  ,, , ,,, ')
+    results = utils.parse.parse_call_sign(',  ,, , ,,, ')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_call_sign(None)
+    results = utils.parse.parse_call_sign(None)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_call_sign(42)
+    results = utils.parse.parse_call_sign(42)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_call_sign('this is not a parseable call sign at all')
+    results = utils.parse.parse_call_sign(
+        'this is not a parseable call sign at all')
     assert isinstance(results, list)
     assert len(results) == 9
 
-    results = utils.parse_call_sign(
-        'this is not a parseable call sign at all', store_unparseable=False)
+    results = utils.parse.parse_call_sign(
+        'this is not a parseable call sign at all',
+        store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
     # Now test valid call signs
-    results = utils.parse_call_sign('0A1DEF')
+    results = utils.parse.parse_call_sign('0A1DEF')
     assert isinstance(results, list)
     assert len(results) == 1
     assert '0A1DEF' in results
 
-    results = utils.parse_call_sign('0A1DEF, DF1ABC')
+    results = utils.parse.parse_call_sign('0A1DEF, DF1ABC')
     assert isinstance(results, list)
     assert len(results) == 2
     assert '0A1DEF' in results
@@ -1658,65 +1678,66 @@ def test_parse_call_sign():
 def test_parse_phone_no():
     """utils: parse_phone_no() testing """
     # A simple single array entry (As str)
-    results = utils.parse_phone_no('')
+    results = utils.parse.parse_phone_no('')
     assert isinstance(results, list)
     assert len(results) == 0
 
     # just delimeters
-    results = utils.parse_phone_no(',  ,, , ,,, ')
+    results = utils.parse.parse_phone_no(',  ,, , ,,, ')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no(',')
+    results = utils.parse.parse_phone_no(',')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no(None)
+    results = utils.parse.parse_phone_no(None)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no(42)
+    results = utils.parse.parse_phone_no(42)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no('this is not a parseable phoneno at all')
+    results = utils.parse.parse_phone_no(
+        'this is not a parseable phoneno at all')
     assert isinstance(results, list)
     assert len(results) == 8
     # Now we do it again with the store_unparsable flag set to False
-    results = utils.parse_phone_no(
+    results = utils.parse.parse_phone_no(
         'this is not a parseable email at all', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no('+', store_unparseable=False)
+    results = utils.parse.parse_phone_no('+', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no('(', store_unparseable=False)
+    results = utils.parse.parse_phone_no('(', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
     # Number is too short
-    results = utils.parse_phone_no('0', store_unparseable=False)
+    results = utils.parse.parse_phone_no('0', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_phone_no('12', store_unparseable=False)
+    results = utils.parse.parse_phone_no('12', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
     # Now test valid phone numbers
-    results = utils.parse_phone_no('+1 (124) 245 2345')
+    results = utils.parse.parse_phone_no('+1 (124) 245 2345')
     assert isinstance(results, list)
     assert len(results) == 1
     assert '+1 (124) 245 2345' in results
 
-    results = utils.parse_phone_no('911', store_unparseable=False)
+    results = utils.parse.parse_phone_no('911', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 1
     assert '911' in results
 
-    results = utils.parse_phone_no(
+    results = utils.parse.parse_phone_no(
         '911, 123-123-1234', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 2
@@ -1724,13 +1745,13 @@ def test_parse_phone_no():
     assert '123-123-1234' in results
 
     # Space variations
-    results = utils.parse_phone_no(' 911  , +1 (123) 123-1234')
+    results = utils.parse.parse_phone_no(' 911  , +1 (123) 123-1234')
     assert isinstance(results, list)
     assert len(results) == 2
     assert '911' in results
     assert '+1 (123) 123-1234' in results
 
-    results = utils.parse_phone_no(' 911  , + 1 ( 123 ) 123-1234')
+    results = utils.parse.parse_phone_no(' 911  , + 1 ( 123 ) 123-1234')
     assert isinstance(results, list)
     assert len(results) == 2
     assert '911' in results
@@ -1740,48 +1761,48 @@ def test_parse_phone_no():
 def test_parse_emails():
     """utils: parse_emails() testing """
     # A simple single array entry (As str)
-    results = utils.parse_emails('')
+    results = utils.parse.parse_emails('')
     assert isinstance(results, list)
     assert len(results) == 0
 
     # just delimeters
-    results = utils.parse_emails(',  ,, , ,,, ')
+    results = utils.parse.parse_emails(',  ,, , ,,, ')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_emails(',')
+    results = utils.parse.parse_emails(',')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_emails(None)
+    results = utils.parse.parse_emails(None)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_emails(42)
+    results = utils.parse.parse_emails(42)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_emails('this is not a parseable email at all')
+    results = utils.parse.parse_emails('this is not a parseable email at all')
     assert isinstance(results, list)
     assert len(results) == 8
     # Now we do it again with the store_unparsable flag set to False
-    results = utils.parse_emails(
+    results = utils.parse.parse_emails(
         'this is not a parseable email at all', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
     # Now test valid emails
-    results = utils.parse_emails('user@example.com')
+    results = utils.parse.parse_emails('user@example.com')
     assert isinstance(results, list)
     assert len(results) == 1
     assert 'user@example.com' in results
 
-    results = utils.parse_emails('a@')
+    results = utils.parse.parse_emails('a@')
     assert isinstance(results, list)
     assert len(results) == 1
     assert 'a@' in results
 
-    results = utils.parse_emails('user1@example.com user2@example.com')
+    results = utils.parse.parse_emails('user1@example.com user2@example.com')
     assert isinstance(results, list)
     assert len(results) == 2
     assert 'user1@example.com' in results
@@ -1795,7 +1816,7 @@ def test_parse_emails():
         'David Spade dspade@example.com, Yours Truly yours@truly.com',
     ]
 
-    results = utils.parse_emails(', '.join(emails))
+    results = utils.parse.parse_emails(', '.join(emails))
     assert isinstance(results, list)
     assert len(results) == 6
     assert 'user1@example.com' in results
@@ -1815,38 +1836,38 @@ def test_parse_emails():
         '5th User: user4@example.com',
     ]
 
-    results = utils.parse_emails(', '.join(emails))
+    results = utils.parse.parse_emails(', '.join(emails))
     assert isinstance(results, list)
     assert len(results) == len(emails)
     for email in emails:
         assert email in results
 
     # pass the entries in as a list
-    results = utils.parse_emails(emails)
+    results = utils.parse.parse_emails(emails)
     assert isinstance(results, list)
     assert len(results) == len(emails)
     for email in emails:
         assert email in results
 
     # Pass in some unparseables
-    results = utils.parse_emails('garbage')
+    results = utils.parse.parse_emails('garbage')
     assert isinstance(results, list)
     assert len(results) == 1
 
-    results = utils.parse_emails('garbage', store_unparseable=False)
+    results = utils.parse.parse_emails('garbage', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
     # Pass in garbage
-    results = utils.parse_emails(object)
+    results = utils.parse.parse_emails(object)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_emails(42)
+    results = utils.parse.parse_emails(42)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_emails([None, object, 42])
+    results = utils.parse.parse_emails([None, object, 42])
     assert isinstance(results, list)
     assert len(results) == 0
 
@@ -1854,51 +1875,51 @@ def test_parse_emails():
 def test_parse_urls():
     """utils: parse_urls() testing """
     # A simple single array entry (As str)
-    results = utils.parse_urls('')
+    results = utils.parse.parse_urls('')
     assert isinstance(results, list)
     assert len(results) == 0
 
     # just delimeters
-    results = utils.parse_urls(',  ,, , ,,, ')
+    results = utils.parse.parse_urls(',  ,, , ,,, ')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_urls(',')
+    results = utils.parse.parse_urls(',')
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_urls(None)
+    results = utils.parse.parse_urls(None)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_urls(42)
+    results = utils.parse.parse_urls(42)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_urls('this is not a parseable url at all')
+    results = utils.parse.parse_urls('this is not a parseable url at all')
     assert isinstance(results, list)
     # we still end up returning this
     assert len(results) == 8
 
-    results = utils.parse_urls(
+    results = utils.parse.parse_urls(
         'this is not a parseable url at all', store_unparseable=False)
     assert isinstance(results, list)
     assert len(results) == 0
 
     # Now test valid URLs
-    results = utils.parse_urls('windows://')
+    results = utils.parse.parse_urls('windows://')
     assert isinstance(results, list)
     assert len(results) == 1
     assert 'windows://' in results
 
-    results = utils.parse_urls('windows:// gnome://')
+    results = utils.parse.parse_urls('windows:// gnome://')
     assert isinstance(results, list)
     assert len(results) == 2
     assert 'windows://' in results
     assert 'gnome://' in results
 
     # We don't want to parse out URLs that are part of another URL's arguments
-    results = utils.parse_urls('discord://host?url=https://localhost')
+    results = utils.parse.parse_urls('discord://host?url=https://localhost')
     assert isinstance(results, list)
     assert len(results) == 1
     assert 'discord://host?url=https://localhost' in results
@@ -1922,7 +1943,7 @@ def test_parse_urls():
     # comma exists as part of the URL and is therefore lost if it was found
     # at the end of it.
 
-    results = utils.parse_urls(', '.join(urls))
+    results = utils.parse.parse_urls(', '.join(urls))
     assert isinstance(results, list)
     assert len(results) == len(urls)
     for url in urls:
@@ -1934,7 +1955,7 @@ def test_parse_urls():
     # The comma at the end of the password will not be lost if we're
     # dealing with a single entry:
     url = 'http://hostname?password=,abcd,'
-    results = utils.parse_urls(url)
+    results = utils.parse.parse_urls(url)
     assert isinstance(results, list)
     assert len(results) == 1
     assert url in results
@@ -1945,7 +1966,7 @@ def test_parse_urls():
         'schema1://hostname?password=,abcd,',
         'schema2://hostname?password=,abcd,',
     ]
-    results = utils.parse_urls(', '.join(urls))
+    results = utils.parse.parse_urls(', '.join(urls))
     assert isinstance(results, list)
     assert len(results) == len(urls)
 
@@ -1959,20 +1980,20 @@ def test_parse_urls():
     assert urls[1] in results
 
     # Pass the list in (as a list); results are the same
-    results = utils.parse_urls(urls)
+    results = utils.parse.parse_urls(urls)
     assert isinstance(results, list)
     assert len(results) == len(urls)
 
     # Pass in garbage
-    results = utils.parse_urls(object)
+    results = utils.parse.parse_urls(object)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_urls(42)
+    results = utils.parse.parse_urls(42)
     assert isinstance(results, list)
     assert len(results) == 0
 
-    results = utils.parse_urls([None, object, 42])
+    results = utils.parse.parse_urls([None, object, 42])
     assert isinstance(results, list)
     assert len(results) == 0
 
@@ -1998,7 +2019,7 @@ def test_dict_full_update():
         'c': 'updated',
         'e': 5,
     }
-    utils.dict_full_update(dict_1, dict_2)
+    utils.logic.dict_full_update(dict_1, dict_2)
     # Dictionary 2 is untouched
     assert len(dict_2) == 3
     assert dict_2['c'] == 'updated'
@@ -2023,7 +2044,7 @@ def test_parse_list():
     """utils: parse_list() testing """
 
     # A simple single array entry (As str)
-    results = utils.parse_list(
+    results = utils.parse.parse_list(
         '.mkv,.avi,.divx,.xvid,.mov,.wmv,.mp4,.mpg,.mpeg,.vob,.iso')
 
     assert results == sorted([
@@ -2036,7 +2057,7 @@ def __str__(self):
             return '.avi'
 
     # Now 2 lists with lots of duplicates and other delimiters
-    results = utils.parse_list(
+    results = utils.parse.parse_list(
         '.mkv,.avi,.divx,.xvid,.mov,.wmv,.mp4,.mpg .mpeg,.vob,,; ;',
         ('.mkv,.avi,.divx,.xvid,.mov    ', '    .wmv,.mp4;.mpg,.mpeg,'),
         '.vob,.iso', ['.vob', ['.vob', '.mkv', StrangeObject(), ], ],
@@ -2048,11 +2069,11 @@ def __str__(self):
     ])
 
     # Garbage in is removed
-    assert utils.parse_list(object(), 42, None) == []
+    assert utils.parse.parse_list(object(), 42, None) == []
 
     # Now a list with extras we want to add as strings
     # empty entries are removed
-    results = utils.parse_list([
+    results = utils.parse.parse_list([
         '.divx', '.iso', '.mkv', '.mov', '', '  ', '.avi', '.mpeg', '.vob',
         '.xvid', '.mp4'], '.mov,.wmv,.mp4,.mpg')
 
@@ -2073,8 +2094,10 @@ def test_import_module(tmpdir):
 
     I can't be loaded
     """))
-    assert utils.import_module(str(bad_file), 'invalidfile1') is None
-    assert utils.import_module(str(bad_file_base), 'invalidfile2') is None
+    assert utils.module.import_module(
+        str(bad_file), 'invalidfile1') is None
+    assert utils.module.import_module(
+        str(bad_file_base), 'invalidfile2') is None
 
 
 def test_module_detection(tmpdir):
@@ -2420,24 +2443,26 @@ def test_exclusive_match():
     """
 
     # No Logic always returns True if there is also no data
-    assert utils.is_exclusive_match(data=None, logic=None) is True
-    assert utils.is_exclusive_match(data=None, logic=set()) is True
-    assert utils.is_exclusive_match(data='', logic=set()) is True
-    assert utils.is_exclusive_match(data=u'', logic=set()) is True
+    assert utils.logic.is_exclusive_match(data=None, logic=None) is True
+    assert utils.logic.is_exclusive_match(data=None, logic=set()) is True
+    assert utils.logic.is_exclusive_match(data='', logic=set()) is True
+    assert utils.logic.is_exclusive_match(data=u'', logic=set()) is True
 
     # however, once data is introduced, True is no longer returned
     # if no logic has been specified
-    assert utils.is_exclusive_match(data=u'check', logic=set()) is False
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(data=u'check', logic=set()) is False
+    assert utils.logic.is_exclusive_match(
         data=['check', 'checkb'], logic=set()) is False
 
     # String delimters are stripped out so that a list can be formed
     # the below is just an empty token list
-    assert utils.is_exclusive_match(data=set(), logic=',;   ,') is True
+    assert utils.logic.is_exclusive_match(data=set(), logic=',;   ,') is True
 
     # garbage logic is never an exclusive match
-    assert utils.is_exclusive_match(data=set(), logic=object()) is False
-    assert utils.is_exclusive_match(data=set(), logic=[object(), ]) is False
+    assert utils.logic.is_exclusive_match(
+        data=set(), logic=object()) is False
+    assert utils.logic.is_exclusive_match(
+        data=set(), logic=[object(), ]) is False
 
     #
     # Test with logic:
@@ -2445,28 +2470,28 @@ def test_exclusive_match():
     data = set(['abc'])
 
     # def in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic='def', data=data) is False
     # def in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=['def', ], data=data) is False
     # def in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=('def', ), data=data) is False
     # def in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=set(['def', ]), data=data) is False
     # abc in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=['abc', ], data=data) is True
     # abc in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=('abc', ), data=data) is True
     # abc in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=set(['abc', ]), data=data) is True
     # abc or def in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic='abc, def', data=data) is True
 
     #
@@ -2475,49 +2500,49 @@ def test_exclusive_match():
     data = set(['abc', 'def', 'efg', 'xyz'])
 
     # match_all matches everything
-    assert utils.is_exclusive_match(logic='all', data=data) is True
-    assert utils.is_exclusive_match(logic=['all'], data=data) is True
+    assert utils.logic.is_exclusive_match(logic='all', data=data) is True
+    assert utils.logic.is_exclusive_match(logic=['all'], data=data) is True
 
     # def and abc in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=[('abc', 'def')], data=data) is True
 
     # cba and abc in data
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=[('cba', 'abc')], data=data) is False
 
     # www or zzz or abc and xyz
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=['www', 'zzz', ('abc', 'xyz')], data=data) is True
     # www or zzz or abc and xyz (strings are valid too)
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=['www', 'zzz', ('abc, xyz')], data=data) is True
 
     # www or zzz or abc and jjj
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic=['www', 'zzz', ('abc', 'jjj')], data=data) is False
 
     #
     # Empty data set
     #
     data = set()
-    assert utils.is_exclusive_match(logic=['www'], data=data) is False
-    assert utils.is_exclusive_match(logic='all', data=data) is True
+    assert utils.logic.is_exclusive_match(logic=['www'], data=data) is False
+    assert utils.logic.is_exclusive_match(logic='all', data=data) is True
 
     #
     # Update our data set so we can do more advance checks
     #
     data = set(['always', 'entry1'])
     # We'll always match on the with keyword always
-    assert utils.is_exclusive_match(logic='always', data=data) is True
-    assert utils.is_exclusive_match(logic='garbage', data=data) is True
+    assert utils.logic.is_exclusive_match(logic='always', data=data) is True
+    assert utils.logic.is_exclusive_match(logic='garbage', data=data) is True
     # However we will not match if we turn this feature off
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic='garbage', data=data, match_always=False) is False
 
     # Change default value from 'all' to 'match_me'. Logic matches
     # so we pass
-    assert utils.is_exclusive_match(
+    assert utils.logic.is_exclusive_match(
         logic='match_me', data=data, match_all='match_me') is True
 
 
@@ -2526,38 +2551,38 @@ def test_apprise_validate_regex():
     API: Apprise() Validate Regex tests
 
     """
-    assert utils.validate_regex(None) is None
-    assert utils.validate_regex(object) is None
-    assert utils.validate_regex(42) is None
-    assert utils.validate_regex("") is None
-    assert utils.validate_regex("  ") is None
-    assert utils.validate_regex("abc") == "abc"
+    assert utils.parse.validate_regex(None) is None
+    assert utils.parse.validate_regex(object) is None
+    assert utils.parse.validate_regex(42) is None
+    assert utils.parse.validate_regex("") is None
+    assert utils.parse.validate_regex("  ") is None
+    assert utils.parse.validate_regex("abc") == "abc"
 
     # value is a keyword that is extracted (if found)
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[^-]+)-', fmt="{value}") == "abcd"
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[^-]+)-', strip=False,
         fmt="{value}") == " abcd "
 
     # String flags supported in addition to numeric
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[^-]+)-', 'i', fmt="{value}") == "abcd"
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[^-]+)-', re.I, fmt="{value}") == "abcd"
 
     # Test multiple flag settings
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[^-]+)-', 'isax', fmt="{value}") == "abcd"
 
     # Invalid flags are just ignored. The below fails to match
     # because the default value of 'i' is over-ridden by what is
     # identfied below, and no flag is set at the end of the day
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[ABCD]+)-', '-%2gb', fmt="{value}") is None
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[ABCD]+)-', '', fmt="{value}") is None
-    assert utils.validate_regex(
+    assert utils.parse.validate_regex(
         "- abcd -", r'-(?P<value>[ABCD]+)-', None, fmt="{value}") is None
 
 
@@ -2567,39 +2592,39 @@ def test_apply_templating():
 
     template = "Hello {{fname}}, How are you {{whence}}?"
 
-    result = utils.apply_template(
+    result = utils.templates.apply_template(
         template, **{'fname': 'Chris', 'whence': 'this morning'})
     assert isinstance(result, str)
     assert result == "Hello Chris, How are you this morning?"
 
     # In this example 'whence' isn't provided, so it isn't swapped
-    result = utils.apply_template(
+    result = utils.templates.apply_template(
         template, **{'fname': 'Chris'})
     assert isinstance(result, str)
     assert result == "Hello Chris, How are you {{whence}}?"
 
     # white space won't cause any ill affects:
     template = "Hello {{ fname }}, How are you {{   whence}}?"
-    result = utils.apply_template(
+    result = utils.templates.apply_template(
         template, **{'fname': 'Chris', 'whence': 'this morning'})
     assert isinstance(result, str)
     assert result == "Hello Chris, How are you this morning?"
 
     # No arguments won't cause any problems
     template = "Hello {{fname}}, How are you {{whence}}?"
-    result = utils.apply_template(template)
+    result = utils.templates.apply_template(template)
     assert isinstance(result, str)
     assert result == template
 
     # Wrong elements are simply ignored
-    result = utils.apply_template(
+    result = utils.templates.apply_template(
         template,
         **{'fname': 'l2g', 'whence': 'this evening', 'ignore': 'me'})
     assert isinstance(result, str)
     assert result == "Hello l2g, How are you this evening?"
 
     # Empty template makes things easy
-    result = utils.apply_template(
+    result = utils.templates.apply_template(
         "", **{'fname': 'l2g', 'whence': 'this evening'})
     assert isinstance(result, str)
     assert result == ""
@@ -2607,14 +2632,14 @@ def test_apply_templating():
     # Regular expressions are safely escapped and act as normal
     # tokens:
     template = "Hello {{.*}}, How are you {{[A-Z0-9]+}}?"
-    result = utils.apply_template(
+    result = utils.templates.apply_template(
         template, **{'.*': 'l2g', '[A-Z0-9]+': 'this afternoon'})
     assert result == "Hello l2g, How are you this afternoon?"
 
     # JSON is handled too such as escaping quotes
     template = '{value: "{{ value }}"}'
-    result = utils.apply_template(
-        template, app_mode=utils.TemplateType.JSON,
+    result = utils.templates.apply_template(
+        template, app_mode=utils.templates.TemplateType.JSON,
         **{'value': '"quotes are escaped"'})
     assert result == '{value: "\\"quotes are escaped\\""}'
 
@@ -2622,52 +2647,54 @@ def test_apply_templating():
 def test_cwe312_word():
     """utils: cwe312_word() testing
     """
-    assert utils.cwe312_word(None) is None
-    assert utils.cwe312_word(42) == 42
-    assert utils.cwe312_word('') == ''
-    assert utils.cwe312_word(' ') == ' '
-    assert utils.cwe312_word('!') == '!'
+    assert utils.cwe312.cwe312_word(None) is None
+    assert utils.cwe312.cwe312_word(42) == 42
+    assert utils.cwe312.cwe312_word('') == ''
+    assert utils.cwe312.cwe312_word(' ') == ' '
+    assert utils.cwe312.cwe312_word('!') == '!'
 
-    assert utils.cwe312_word('a') == 'a'
-    assert utils.cwe312_word('ab') == 'ab'
-    assert utils.cwe312_word('abc') == 'abc'
-    assert utils.cwe312_word('abcd') == 'abcd'
-    assert utils.cwe312_word('abcd', force=True) == 'a...d'
+    assert utils.cwe312.cwe312_word('a') == 'a'
+    assert utils.cwe312.cwe312_word('ab') == 'ab'
+    assert utils.cwe312.cwe312_word('abc') == 'abc'
+    assert utils.cwe312.cwe312_word('abcd') == 'abcd'
+    assert utils.cwe312.cwe312_word('abcd', force=True) == 'a...d'
 
-    assert utils.cwe312_word('abc--d') == 'abc--d'
-    assert utils.cwe312_word('a-domain.ca') == 'a...a'
+    assert utils.cwe312.cwe312_word('abc--d') == 'abc--d'
+    assert utils.cwe312.cwe312_word('a-domain.ca') == 'a...a'
 
     # Variances to still catch domain
-    assert utils.cwe312_word('a-domain.ca', advanced=False) == 'a-domain.ca'
-    assert utils.cwe312_word('a-domain.ca', threshold=6) == 'a-domain.ca'
+    assert utils.cwe312.cwe312_word(
+        'a-domain.ca', advanced=False) == 'a-domain.ca'
+    assert utils.cwe312.cwe312_word(
+        'a-domain.ca', threshold=6) == 'a-domain.ca'
 
 
 def test_cwe312_url():
     """utils: cwe312_url() testing
     """
-    assert utils.cwe312_url(None) is None
-    assert utils.cwe312_url(42) == 42
-    assert utils.cwe312_url('http://') == 'http://'
-    assert utils.cwe312_url('discord://') == 'discord://'
-    assert utils.cwe312_url('path') == 'http://path'
-    assert utils.cwe312_url('path/') == 'http://path/'
+    assert utils.cwe312.cwe312_url(None) is None
+    assert utils.cwe312.cwe312_url(42) == 42
+    assert utils.cwe312.cwe312_url('http://') == 'http://'
+    assert utils.cwe312.cwe312_url('discord://') == 'discord://'
+    assert utils.cwe312.cwe312_url('path') == 'http://path'
+    assert utils.cwe312.cwe312_url('path/') == 'http://path/'
 
     # Now test http:// private data
-    assert utils.cwe312_url(
+    assert utils.cwe312.cwe312_url(
         'http://user:pass123@localhost') == 'http://user:p...3@localhost'
-    assert utils.cwe312_url(
+    assert utils.cwe312.cwe312_url(
         'http://user@localhost') == 'http://user@localhost'
-    assert utils.cwe312_url(
+    assert utils.cwe312.cwe312_url(
         'http://user@localhost?password=abc123') == \
         'http://user@localhost?password=a...3'
-    assert utils.cwe312_url(
+    assert utils.cwe312.cwe312_url(
         'http://user@localhost?secret=secret-.12345') == \
         'http://user@localhost?secret=s...5'
 
-    assert utils.cwe312_url(
+    assert utils.cwe312.cwe312_url(
         'slack://mybot@xoxb-43598234231-3248932482278-BZK5Wj15B9mPh1RkShJoCZ44'
         '/lead2gold@gmail.com') == 'slack://mybot@x...4/l...m'
-    assert utils.cwe312_url(
+    assert utils.cwe312.cwe312_url(
         'slack://test@B4QP3WWB4/J3QWT41JM/XIl2ffpqXkzkwMXrJdevi7W3/'
         '#random') == 'slack://test@B...4/J...M/X...3/'
 
@@ -2681,14 +2708,14 @@ def test_dict_base64_codec(tmpdir):
         'float': 2.3,
     }
 
-    encoded, needs_decoding = utils.encode_b64_dict(original)
+    encoded, needs_decoding = utils.base64.encode_b64_dict(original)
     assert encoded == {'int': 'b64:MQ==', 'float': 'b64:Mi4z'}
     assert needs_decoding is True
-    decoded = utils.decode_b64_dict(encoded)
+    decoded = utils.base64.decode_b64_dict(encoded)
     assert decoded == original
 
     with mock.patch('json.dumps', side_effect=TypeError()):
-        encoded, needs_decoding = utils.encode_b64_dict(original)
+        encoded, needs_decoding = utils.base64.encode_b64_dict(original)
         # we failed
         assert needs_decoding is False
         assert encoded == {
@@ -2703,7 +2730,7 @@ def test_dir_size(tmpdir):
     """
 
     # Nothing to find/see
-    size, _errors = utils.dir_size(str(tmpdir))
+    size, _errors = utils.disk.dir_size(str(tmpdir))
     assert size == 0
     assert len(_errors) == 0
 
@@ -2714,43 +2741,43 @@ def test_dir_size(tmpdir):
     namespace_1 = tmpdir.mkdir('abcdefg')
     namespace_2 = tmpdir.mkdir('defghij')
     namespace_2.join('cache.psdata').write('0' * 1024 * 1024)
-    size, _errors = utils.dir_size(str(tmpdir))
+    size, _errors = utils.disk.dir_size(str(tmpdir))
     assert size == 1024 * 1024 * 2
     assert len(_errors) == 0
 
     # Write another file
     namespace_1.join('cache.psdata').write('0' * 1024 * 1024)
-    size, _errors = utils.dir_size(str(tmpdir))
+    size, _errors = utils.disk.dir_size(str(tmpdir))
     assert size == 1024 * 1024 * 3
     assert len(_errors) == 0
 
-    size, _errors = utils.dir_size(str(namespace_1))
+    size, _errors = utils.disk.dir_size(str(namespace_1))
     assert size == 1024 * 1024
     assert len(_errors) == 0
 
     # Create a directory insde one of our namespaces
     subspace_1 = namespace_1.mkdir('zyx')
-    size, _errors = utils.dir_size(str(namespace_1))
+    size, _errors = utils.disk.dir_size(str(namespace_1))
     assert size == 1024 * 1024
 
     subspace_1.join('cache.psdata').write('0' * 1024 * 1024)
-    size, _errors = utils.dir_size(str(tmpdir))
+    size, _errors = utils.disk.dir_size(str(tmpdir))
     assert size == 1024 * 1024 * 4
     assert len(_errors) == 0
 
     # Recursion limit reduced... no change at 2 as we can go 2
     # diretories deep no problem
-    size, _errors = utils.dir_size(str(tmpdir), max_depth=2)
+    size, _errors = utils.disk.dir_size(str(tmpdir), max_depth=2)
     assert size == 1024 * 1024 * 4
     assert len(_errors) == 0
 
-    size, _errors = utils.dir_size(str(tmpdir), max_depth=1)
+    size, _errors = utils.disk.dir_size(str(tmpdir), max_depth=1)
     assert size == 1024 * 1024 * 3
     # we can't get into our subspace_1
     assert len(_errors) == 1
     assert str(subspace_1) in _errors
 
-    size, _errors = utils.dir_size(str(tmpdir), max_depth=0)
+    size, _errors = utils.disk.dir_size(str(tmpdir), max_depth=0)
     assert size == 1024 * 1024
     # we can't get into our namespace directories
     assert len(_errors) == 2
@@ -2758,17 +2785,19 @@ def test_dir_size(tmpdir):
     assert str(namespace_2) in _errors
 
     # Let's cause problems now and test the output
-    size, _errors = utils.dir_size('invalid-directory', missing_okay=True)
+    size, _errors = \
+        utils.disk.dir_size('invalid-directory', missing_okay=True)
     assert size == 0
     assert len(_errors) == 0
 
-    size, _errors = utils.dir_size('invalid-directory', missing_okay=False)
+    size, _errors = \
+        utils.disk.dir_size('invalid-directory', missing_okay=False)
     assert size == 0
     assert len(_errors) == 1
     assert 'invalid-directory' in _errors
 
     with mock.patch('os.scandir', side_effect=OSError()):
-        size, _errors = utils.dir_size(str(tmpdir), missing_okay=True)
+        size, _errors = utils.disk.dir_size(str(tmpdir), missing_okay=True)
         assert size == 0
         assert len(_errors) == 1
         assert str(tmpdir) in _errors
@@ -2780,7 +2809,7 @@ def test_dir_size(tmpdir):
         # Mock the scandir return value to yield the mock entry
         mock_scandir.return_value.__enter__.return_value = [mock_entry]
 
-        size, _errors = utils.dir_size(str(tmpdir))
+        size, _errors = utils.disk.dir_size(str(tmpdir))
         assert size == 0
         assert len(_errors) == 1
         assert mock_entry.path in _errors
@@ -2792,7 +2821,7 @@ def test_dir_size(tmpdir):
         mock_entry.path = '/test/path'
         # Mock the scandir return value to yield the mock entry
         mock_scandir.return_value.__enter__.return_value = [mock_entry]
-        size, _errors = utils.dir_size(str(tmpdir))
+        size, _errors = utils.disk.dir_size(str(tmpdir))
         assert len(_errors) == 1
         assert mock_entry.path in _errors
 
@@ -2802,7 +2831,7 @@ def test_dir_size(tmpdir):
         mock_entry.is_dir.return_value = False
         # Mock the scandir return value to yield the mock entry
         mock_scandir.return_value.__enter__.return_value = [mock_entry]
-        size, _errors = utils.dir_size(str(tmpdir))
+        size, _errors = utils.disk.dir_size(str(tmpdir))
         assert size == 0
         assert len(_errors) == 0
 
@@ -2813,7 +2842,7 @@ def test_dir_size(tmpdir):
         # Mock the scandir return value to yield the mock entry
         mock_scandir.return_value.__enter__.return_value = [mock_entry]
 
-        size, _errors = utils.dir_size(str(tmpdir))
+        size, _errors = utils.disk.dir_size(str(tmpdir))
         assert size == 0
         # No file isn't a problem, we're calculating disksize anyway,
         # one less thing to calculate
@@ -2825,19 +2854,19 @@ def test_bytes_to_str():
     Test Bytes to String representation
     """
     # Garbage Entry
-    assert utils.bytes_to_str(None) is None
-    assert utils.bytes_to_str('') is None
-    assert utils.bytes_to_str('GARBAGE') is None
+    assert utils.disk.bytes_to_str(None) is None
+    assert utils.disk.bytes_to_str('') is None
+    assert utils.disk.bytes_to_str('GARBAGE') is None
 
     # Good Entries
-    assert utils.bytes_to_str(0) == "0.00B"
-    assert utils.bytes_to_str(1) == "1.00B"
-    assert utils.bytes_to_str(1.1) == "1.10B"
-    assert utils.bytes_to_str(1024) == "1.00KB"
-    assert utils.bytes_to_str(1024 * 1024) == "1.00MB"
-    assert utils.bytes_to_str(1024 * 1024 * 1024) == "1.00GB"
-    assert utils.bytes_to_str(1024 * 1024 * 1024 * 1024) == "1.00TB"
+    assert utils.disk.bytes_to_str(0) == "0.00B"
+    assert utils.disk.bytes_to_str(1) == "1.00B"
+    assert utils.disk.bytes_to_str(1.1) == "1.10B"
+    assert utils.disk.bytes_to_str(1024) == "1.00KB"
+    assert utils.disk.bytes_to_str(1024 * 1024) == "1.00MB"
+    assert utils.disk.bytes_to_str(1024 * 1024 * 1024) == "1.00GB"
+    assert utils.disk.bytes_to_str(1024 * 1024 * 1024 * 1024) == "1.00TB"
 
     # Support strings too
-    assert utils.bytes_to_str("0") == "0.00B"
-    assert utils.bytes_to_str("1024") == "1.00KB"
+    assert utils.disk.bytes_to_str("0") == "0.00B"
+    assert utils.disk.bytes_to_str("1024") == "1.00KB"
diff --git a/test/test_plugin_email.py b/test/test_plugin_email.py
index 8a365c9f5..47407490b 100644
--- a/test/test_plugin_email.py
+++ b/test/test_plugin_email.py
@@ -43,9 +43,11 @@
 from apprise import AttachBase
 from apprise import AppriseAsset
 from apprise import PersistentStoreMode
+from apprise.exception import AppriseException
 from apprise.config import ConfigBase
 from apprise import AppriseAttachment
 from apprise.plugins import email
+from apprise import utils
 
 # Disable logging for a cleaner testing output
 logging.disable(logging.CRITICAL)
@@ -466,7 +468,7 @@ def test_plugin_email_webbase_lookup(mock_smtp, mock_smtpssl):
     """
 
     # Insert a test email at the head of our table
-    email.EMAIL_TEMPLATES = (
+    email.templates.EMAIL_TEMPLATES = (
         (
             # Testing URL
             'Testing Lookup',
@@ -478,7 +480,7 @@ def test_plugin_email_webbase_lookup(mock_smtp, mock_smtpssl):
                 'login_type': (email.WebBaseLogin.USERID, )
             },
         ),
-    ) + email.EMAIL_TEMPLATES
+    ) + email.templates.EMAIL_TEMPLATES
 
     obj = Apprise.instantiate(
         'mailto://user:pass@l2g.com', suppress_exceptions=True)
@@ -2073,8 +2075,8 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
     mock_smtp.return_value = mock_socket
     mock_smtpssl.return_value = mock_socket
 
-    assert email.PGP_SUPPORT is True
-    email.PGP_SUPPORT = False
+    assert utils.pgp.PGP_SUPPORT is True
+    utils.pgp.PGP_SUPPORT = False
     # Forces to run through section of code that produces a warning there is
     # no PGP
     obj = Apprise.instantiate('mailto://user:pass@nuxref.com?pgp=yes')
@@ -2082,17 +2084,17 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
     assert obj.notify('test body') is False
 
     # Return the PGP status for remaining checks
-    email.PGP_SUPPORT = True
+    utils.pgp.PGP_SUPPORT = True
 
     # Initialize our email (no from name)
-    obj = Apprise.instantiate('mailto://user:pass@nuxref.com?pgp=yes')
+    obj = Apprise.instantiate('mailto://user2:pass@nuxref.com?pgp=yes')
 
     # Nothing to lookup
-    assert obj.pgp_pubkey() is None
-    assert obj.pgp_public_key() is None
-    assert obj.pgp_encrypt_message("message") is False
+    assert obj.pgp.public_keyfile() is None
+    assert obj.pgp.public_key() is None
+    assert obj.pgp.encrypt("message") is False
     # Keys can not be generated in memory mode
-    assert obj.pgp_generate_keys() is False
+    assert obj.pgp.keygen() is False
 
     # The reason... no location to store data
     assert obj.store.mode == PersistentStoreMode.MEMORY
@@ -2109,14 +2111,13 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
     assert obj.store.mode == PersistentStoreMode.FLUSH
 
     # Still no public key
-    assert obj.pgp_pubkey() is None
-
-    assert obj.pgp_generate_keys() is True
+    assert obj.pgp.public_key(autogen=False) is None
+    assert obj.pgp.keygen() is True
     # Now we'll have a public key
-    assert isinstance(obj.pgp_pubkey(), str)
+    assert isinstance(obj.pgp.public_keyfile(), str)
 
     # Generate warning by second call
-    assert obj.pgp_generate_keys() is True
+    assert obj.pgp.keygen() is True
 
     # Remove newly generated files
     os.unlink(os.path.join(obj.store.path, 'pgp-pub.asc'))
@@ -2124,34 +2125,65 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
     obj = Apprise.instantiate(
         'mailto://pgp:pass@nuxref.com?pgp=yes', asset=asset)
     assert obj.store.mode == PersistentStoreMode.FLUSH
-    assert obj.pgp_generate_keys() is True
+    assert obj.pgp.keygen() is True
 
-    # Prepare PGP
+    # Prepare PGP while providing it a key
     obj = Apprise.instantiate(
-        'mailto://pgp:pass@nuxref.com?pgp=yes&pgpkey=%s' % obj.pgp_pubkey(),
-        asset=asset)
+        'mailto://pgp:pass@nuxref.com?pgp=yes&pgpkey=%s' %
+        obj.pgp.public_keyfile(), asset=asset)
 
-    # Regenerate our keys even with a pgpkey provided
-    assert obj.pgp_generate_keys() is True
+    # keyfile Defined
+    assert obj.pgp.pub_keyfile is not None
 
-    # Second call uses cache
-    assert obj.pgp_generate_keys() is True
+    # Get our key
+    key = obj.pgp.public_key()
+
+    # In this circumstance we can not generate a new key as the one provided
+    # is immutable
+    assert obj.pgp.keygen() is False
+
+    # Our key is the same
+    assert key is obj.pgp.public_key()
+
+    tmpdir0 = tmpdir.mkdir('tmp00a')
+    asset0 = AppriseAsset(
+        storage_mode=PersistentStoreMode.FLUSH,
+        storage_path=str(tmpdir0),
+    )
 
-    # Utilize path parameter
-    assert obj.pgp_generate_keys(path=obj.store.path) is True
+    # Prepare Invalid PGP Key
+    obj = Apprise.instantiate(
+        'mailto://pgpX:pass@nuxref.com?pgp=yes',
+        asset=asset0)
+
+    # No keyfiles
+    assert obj.pgp.pub_keyfile is None
+
+    # Generate our keys
+    assert obj.pgp.keygen() is True
+
+    # Second call uses cache
+    assert obj.pgp.keygen() is True
 
     # We will find our key
-    assert obj.pgp_public_key() is not None
+    key = obj.pgp.public_key()
+    assert key is not None
 
-    tmpdir1 = tmpdir.mkdir('tmp01')
-    # However explicitly setting a path works
-    assert obj.pgp_generate_keys(str(tmpdir1)) is True
+    # Utilize force parameter
+    assert obj.pgp.keygen(force=True) is True
+
+    # Our key is new
+    assert key != obj.pgp.public_key()
+    assert obj.pgp.public_key() is not None
 
     # Prepare Invalid PGP Key
     obj = Apprise.instantiate(
         'mailto://pgp:pass@nuxref.com?pgp=yes&pgpkey=invalid',
         asset=asset)
-    assert obj.pgp_pubkey() is False
+
+    # Returns false
+    assert obj.pgp.pub_keyfile is False
+    assert obj.pgp.public_keyfile() is False
 
     tmpdir2 = tmpdir.mkdir('tmp02')
     asset = AppriseAsset(
@@ -2162,18 +2194,13 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
         'mailto://chris:pass@nuxref.com?pgp=yes', asset=asset)
 
     assert obj.store.mode == PersistentStoreMode.FLUSH
-    assert obj.pgp_generate_keys() is True
+    assert obj.pgp.keygen() is True
 
     # Second call uses cache
-    assert obj.pgp_generate_keys() is True
-    # Utilize path parameter
-    assert obj.pgp_generate_keys(path=obj.store.path) is True
+    assert obj.pgp.keygen() is True
 
     # We will find our key
-    assert obj.pgp_public_key() is not None
-
-    # However explicitly setting a path works
-    assert obj.pgp_generate_keys(str(tmpdir1)) is True
+    assert obj.pgp.public_key() is not None
 
     # We do this again but even when we do a requisition for a public key
     # it will generate a new pair or keys for us once it detects we don't
@@ -2189,9 +2216,9 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
     assert obj.store.mode == PersistentStoreMode.FLUSH
 
     # We'll have a public key object to encrypt with
-    assert obj.pgp_public_key() is not None
+    assert obj.pgp.public_key() is not None
 
-    encrypted = obj.pgp_encrypt_message("hello world")
+    encrypted = obj.pgp.encrypt("hello world")
     assert encrypted.startswith('-----BEGIN PGP MESSAGE-----')
     assert encrypted.rstrip().endswith('-----END PGP MESSAGE-----')
 
@@ -2199,7 +2226,7 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
     assert 'chris-pub.asc' in dir_content
     assert 'chris-prv.asc' in dir_content
 
-    assert obj.pgp_pubkey().endswith('chris-pub.asc')
+    assert obj.pgp.public_keyfile().endswith('chris-pub.asc')
 
     assert obj.notify('test body') is True
 
@@ -2209,53 +2236,53 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
         os.path.join(obj.store.path, 'chris-pub.asc'),
         os.path.join(obj.store.path, 'user@example.com-pub.asc'))
 
-    assert obj.pgp_pubkey() is None
-    assert obj.pgp_pubkey(email="not-reference@example.com") is None
-    assert obj.pgp_pubkey(email="user@example.com")\
+    assert obj.pgp.public_keyfile() is None
+    assert obj.pgp.public_keyfile("not-reference@example.com") is None
+    assert obj.pgp.public_keyfile("user@example.com")\
         .endswith('user@example.com-pub.asc')
 
-    assert obj.pgp_pubkey(email="user@example.com")\
+    assert obj.pgp.public_keyfile("user@example.com")\
         .endswith('user@example.com-pub.asc')
-    assert obj.pgp_pubkey(email="User@Example.com")\
+    assert obj.pgp.public_keyfile("User@Example.com")\
         .endswith('user@example.com-pub.asc')
-    assert obj.pgp_pubkey(email="unknown") is None
+    assert obj.pgp.public_keyfile("unknown") is None
 
     shutil.copyfile(
         os.path.join(obj.store.path, 'user@example.com-pub.asc'),
         os.path.join(obj.store.path, 'user-pub.asc'),
     )
 
-    assert obj.pgp_pubkey(email="user@example.com")\
+    assert obj.pgp.public_keyfile("user@example.com")\
         .endswith('user@example.com-pub.asc')
-    assert obj.pgp_pubkey(email="User@Example.com")\
+    assert obj.pgp.public_keyfile("User@Example.com")\
         .endswith('user@example.com-pub.asc')
 
     # Remove file
     os.unlink(os.path.join(obj.store.path, 'user@example.com-pub.asc'))
-    assert obj.pgp_pubkey(email="user@example.com").endswith('user-pub.asc')
+    assert obj.pgp.public_keyfile("user@example.com").endswith('user-pub.asc')
     shutil.copyfile(
         os.path.join(obj.store.path, 'user-pub.asc'),
         os.path.join(obj.store.path, 'chris-pub.asc'),
     )
     # user-pub.asc still trumps still trumps
-    assert obj.pgp_pubkey(email="user@example.com").endswith('user-pub.asc')
+    assert obj.pgp.public_keyfile("user@example.com").endswith('user-pub.asc')
     shutil.copyfile(
         os.path.join(obj.store.path, 'chris-pub.asc'),
         os.path.join(obj.store.path, 'chris@nuxref.com-pub.asc'),
     )
     # user-pub still trumps
-    assert obj.pgp_pubkey(email="user@example.com").endswith('user-pub.asc')
-    assert obj.pgp_pubkey(email="invalid@example.com")\
+    assert obj.pgp.public_keyfile("user@example.com").endswith('user-pub.asc')
+    assert obj.pgp.public_keyfile("invalid@example.com")\
         .endswith('chris@nuxref.com-pub.asc')
 
     # remove this file
     os.unlink(os.path.join(obj.store.path, 'user-pub.asc'))
 
     # now we fall back to basic/default configuration
-    assert obj.pgp_pubkey(email="user@example.com")\
+    assert obj.pgp.public_keyfile("user@example.com")\
         .endswith('chris@nuxref.com-pub.asc')
     os.unlink(os.path.join(obj.store.path, 'chris@nuxref.com-pub.asc'))
-    assert obj.pgp_pubkey(email="user@example.com").endswith('chris-pub.asc')
+    assert obj.pgp.public_keyfile("user@example.com").endswith('chris-pub.asc')
 
     # Testing again
     tmpdir4 = tmpdir.mkdir('tmp04')
@@ -2268,47 +2295,47 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
 
     with mock.patch('builtins.open', side_effect=FileNotFoundError):
         # can't open key
-        assert obj.pgp_public_key(path=obj.store.path) is None
+        assert obj.pgp.public_key() is None
 
     with mock.patch('builtins.open', side_effect=OSError):
         # can't open key
-        assert obj.pgp_public_key(path=obj.store.path) is None
+        assert obj.pgp.public_key() is None
         # Test unlink
         with mock.patch('os.unlink', side_effect=OSError):
-            assert obj.pgp_public_key(path=obj.store.path) is None
+            assert obj.pgp.public_key() is None
 
         # Key Generation will fail
-        assert obj.pgp_generate_keys() is False
+        assert obj.pgp.keygen() is False
 
     with mock.patch('pgpy.PGPKey.new', side_effect=NameError):
         # Can't Generate keys
-        assert obj.pgp_generate_keys() is False
+        assert obj.pgp.keygen() is False
         # can't open key
-        assert obj.pgp_public_key(path=obj.store.path) is None
+        assert obj.pgp.public_key() is None
 
-    with mock.patch('pgpy.PGPKey.new', side_effect=FileNotFoundError):
+    with mock.patch('pgpy.PGPKey.from_blob', side_effect=FileNotFoundError):
         # can't open key
-        assert obj.pgp_public_key(path=obj.store.path) is None
+        assert obj.pgp.public_key() is None
 
-    with mock.patch('pgpy.PGPKey.new', side_effect=OSError):
+    with mock.patch('pgpy.PGPKey.from_blob', side_effect=OSError):
         # can't open key
-        assert obj.pgp_public_key(path=obj.store.path) is None
+        assert obj.pgp.public_key() is None
 
     # Can't encrypt key
     with mock.patch('pgpy.PGPKey.from_blob', side_effect=NameError):
-        assert obj.pgp_public_key() is None
+        assert obj.pgp.public_key() is None
 
     with mock.patch('pgpy.PGPMessage.new', side_effect=NameError):
-        assert obj.pgp_encrypt_message("message") is None
+        assert obj.pgp.encrypt("message") is None
         # Attempts to encrypt a message
-        assert obj.notify('test') is False
+        assert obj.notify('test-encrypt') is False
 
     # Create new keys
-    assert obj.pgp_generate_keys() is True
+    assert obj.pgp.keygen() is True
     with mock.patch('os.path.isfile', return_value=False):
         with mock.patch('builtins.open', side_effect=OSError):
             with mock.patch('os.unlink', return_value=None):
-                assert obj.pgp_generate_keys() is False
+                assert obj.pgp.keygen() is False
 
     # Testing again
     tmpdir5 = tmpdir.mkdir('tmp05')
@@ -2321,15 +2348,15 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
 
     # Catch edge case where we just can't generate the the key
     with mock.patch('os.path.isfile', side_effect=(
-            # 5x False to skip through pgp_pubkey()
+            # 5x False to skip through pgp.public_keyfile()
             False, False, False, False, False, False,
-            # 1x True to pass pgp_generate_keys()
+            # 1x True to pass pgp.keygen()
             True,
-            # 5x False to skip through pgp_pubkey() second call
+            # 5x False to skip through pgp.public_keyfile() second call
             False, False, False, False, False, False)):
         with mock.patch('pgpy.PGPKey.from_blob',
                         side_effect=FileNotFoundError):
-            assert obj.pgp_public_key() is None
+            assert obj.pgp.public_key() is None
 
     # Corrupt Data
     tmpdir6 = tmpdir.mkdir('tmp06')
@@ -2364,3 +2391,70 @@ def test_plugin_email_pgp(mock_smtp, mock_smtpssl, tmpdir):
 
     # Notification goes through
     obj.notify('test') is True
+
+
+@pytest.mark.skipif('pgpy' not in sys.modules, reason="Requires PGPy")
+def test_plugin_email_prepare():
+    """
+    NotifyEmail() prepare_emails static function
+
+    """
+    with pytest.raises(AppriseException):
+        # No To: provided
+        for e in email.NotifyEmail.prepare_emails(
+                subject="Email Subject",
+                body="Email Body",
+                from_addr=(None, "test@test.com"), to=[]):
+            pass
+
+    # Most basic call (a lot of defaults are used)
+    _iterator = email.NotifyEmail.prepare_emails(
+        subject="Email Subject",
+        body="Email Body",
+        from_addr=(None, "test@test.com"),
+        to=[('Apprise User', 'apprise@test.com'), ])
+    entries = [i for i in _iterator]
+    assert len(entries) == 1
+
+
+@pytest.mark.skipif('pgpy' not in sys.modules, reason="Requires PGPy")
+def test_plugin_pgp(tmpdir):
+    """
+    Pretty Good Privacy Testing
+    """
+
+    p_obj = utils.pgp.ApprisePGPController(path=None)
+    # No Path
+    assert p_obj.keygen() is False
+    assert p_obj.public_keyfile() is None
+
+    p_obj = utils.pgp.ApprisePGPController(
+        path=None, email='l2g@email.com')
+    # No Path
+    assert p_obj.keygen() is False
+
+    tmpdir0 = tmpdir.mkdir('tmp00')
+    p_obj = utils.pgp.ApprisePGPController(
+        path=str(tmpdir0), email='l2g@email.com')
+
+    # A key can be generated with a path defined
+    assert p_obj.keygen() is True
+    assert p_obj.public_keyfile() is not None
+    # A key can be generated with a path defined
+    assert p_obj.keygen(name='Apprise', force=True) is True
+    assert p_obj.keygen(
+        email='l2g@email.com', name='Apprise', force=True) is True
+
+    assert utils.pgp.PGP_SUPPORT is True
+    utils.pgp.PGP_SUPPORT = False
+
+    with pytest.raises(AppriseException):
+        assert p_obj.public_keyfile()
+
+    # Return the PGP status for remaining checks
+    utils.pgp.PGP_SUPPORT = True
+
+    tmpdir1 = tmpdir.mkdir('tmp01')
+    p_obj = utils.pgp.ApprisePGPController(
+        path=str(tmpdir1), pub_keyfile='bad-file')
+    assert p_obj.public_keyfile() is False