diff --git a/pymdoccbor/mdoc/__init__.py b/pymdoccbor/mdoc/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pymdoccbor/mso/issuer.py b/pymdoccbor/mso/issuer.py
index 94afe2e..0ff6e51 100644
--- a/pymdoccbor/mso/issuer.py
+++ b/pymdoccbor/mso/issuer.py
@@ -4,6 +4,8 @@
 import secrets
 import uuid
 
+from datetime import timezone
+
 from pycose.headers import Algorithm, KID
 from pycose.keys import CoseKey, EC2Key
 from pycose.messages import Sign1Message
@@ -137,7 +139,7 @@ def sign(
         :return: the signed mso
         :rtype: Sign1Message
         """
-        utcnow = datetime.datetime.utcnow()
+        utcnow = datetime.datetime.now(timezone.utc)
         if settings.PYMDOC_EXP_DELTA_HOURS:
             exp = utcnow + datetime.timedelta(
                 hours=settings.PYMDOC_EXP_DELTA_HOURS
diff --git a/pymdoccbor/settings.py b/pymdoccbor/settings.py
index 8ba2777..bba7433 100644
--- a/pymdoccbor/settings.py
+++ b/pymdoccbor/settings.py
@@ -1,6 +1,8 @@
 import datetime
 import os
 
+from datetime import timezone
+
 COSEKEY_HAZMAT_CRV_MAP = {
     "secp256r1": "P_256",
     "secp384r1": "P_384",
@@ -34,11 +36,11 @@
 X509_ORGANIZATION_NAME      = os.getenv('X509_ORGANIZATION_NAME', u"My Company")
 X509_COMMON_NAME            = os.getenv('X509_COMMON_NAME', u"mysite.com")
 
-X509_NOT_VALID_BEFORE       = os.getenv('X509_NOT_VALID_BEFORE', datetime.datetime.utcnow())
+X509_NOT_VALID_BEFORE       = os.getenv('X509_NOT_VALID_BEFORE', datetime.datetime.now(timezone.utc))
 X509_NOT_VALID_AFTER_DAYS   = os.getenv('X509_NOT_VALID_AFTER_DAYS', 10)
 X509_NOT_VALID_AFTER        = os.getenv(
     'X509_NOT_VALID_AFTER', 
-    datetime.datetime.utcnow() + datetime.timedelta(
+    datetime.datetime.now(timezone.utc) + datetime.timedelta(
         days=X509_NOT_VALID_AFTER_DAYS
     )
 )
diff --git a/setup.py b/setup.py
index bc1e583..6bf1045 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
 import re
-
-from glob import glob
-from setuptools import setup
+from setuptools import setup, find_packages
 
 def readme():
     with open('README.md') as f:
@@ -31,15 +29,9 @@ def readme():
     url='https://github.com/peppelinux/pyMDL-MDOC',
     author='Giuseppe De Marco',
     author_email='demarcog83@gmail.com',
-    license='License :: OSI Approved :: Apache Software License',
-    # scripts=[f'{_pkg_name}/bin/{_pkg_name}'],
-    packages=[f"{_pkg_name}"],
-    package_dir={f"{_pkg_name}": f"{_pkg_name}"},
-    package_data={f"{_pkg_name}": [
-            i.replace(f'{_pkg_name}/', '')
-            for i in glob(f'{_pkg_name}/**', recursive=True)
-        ]
-    },
+    license='Apache Software License',
+    packages=find_packages(include=["pymdoccbor", "pymdoccbor.*"]),
+    include_package_data=True,
     install_requires=[
         'cbor2>=5.4.0,<5.5.0',
         'cwt>=2.3.0,<2.4',