diff --git a/micropython/senml/examples/basic_cbor.py b/micropython/senml/examples/basic_cbor.py
index f5e92af37..804a886fc 100644
--- a/micropython/senml/examples/basic_cbor.py
+++ b/micropython/senml/examples/basic_cbor.py
@@ -26,7 +26,7 @@
 
 from senml import *
 import time
-from cbor2 import decoder
+import cbor2
 
 pack = SenmlPack("device_name")
 
@@ -38,5 +38,5 @@
         cbor_val = pack.to_cbor()
         print(cbor_val)
         print(cbor_val.hex())
-        print(decoder.loads(cbor_val))  # convert to string again so we can print it.
+        print(cbor2.loads(cbor_val))  # convert to string again so we can print it.
     time.sleep(1)
diff --git a/micropython/senml/manifest.py b/micropython/senml/manifest.py
index 216717caf..f4743075a 100644
--- a/micropython/senml/manifest.py
+++ b/micropython/senml/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="SenML serialisation for MicroPython.",
-    version="0.1.0",
+    version="0.1.1",
     pypi_publish="micropython-senml",
 )
 
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
index 85b26d40b..4e106fd3e 100644
--- a/micropython/senml/senml/senml_pack.py
+++ b/micropython/senml/senml/senml_pack.py
@@ -27,8 +27,7 @@
 from senml.senml_record import SenmlRecord
 from senml.senml_base import SenmlBase
 import json
-from cbor2 import encoder
-from cbor2 import decoder
+import cbor2
 
 
 class SenmlPackIterator:
@@ -278,7 +277,7 @@ def from_cbor(self, data):
         :param data: a byte array.
         :return: None
         """
-        records = decoder.loads(data)  # load the raw senml data
+        records = cbor2.loads(data)  # load the raw senml data
         naming_map = {
             "bn": -2,
             "bt": -3,
@@ -320,7 +319,7 @@ def to_cbor(self):
         }
         converted = []
         self._build_rec_dict(naming_map, converted)
-        return encoder.dumps(converted)
+        return cbor2.dumps(converted)
 
     def add(self, item):
         """
diff --git a/python-ecosys/cbor2/cbor2/__init__.py b/python-ecosys/cbor2/cbor2/__init__.py
index 40114d8b2..7cd98734e 100644
--- a/python-ecosys/cbor2/cbor2/__init__.py
+++ b/python-ecosys/cbor2/cbor2/__init__.py
@@ -24,5 +24,10 @@
 """
 
 
-from . import decoder
-from . import encoder
+from ._decoder import CBORDecoder
+from ._decoder import load
+from ._decoder import loads
+
+from ._encoder import CBOREncoder
+from ._encoder import dump
+from ._encoder import dumps
diff --git a/python-ecosys/cbor2/cbor2/decoder.py b/python-ecosys/cbor2/cbor2/_decoder.py
similarity index 100%
rename from python-ecosys/cbor2/cbor2/decoder.py
rename to python-ecosys/cbor2/cbor2/_decoder.py
diff --git a/python-ecosys/cbor2/cbor2/encoder.py b/python-ecosys/cbor2/cbor2/_encoder.py
similarity index 100%
rename from python-ecosys/cbor2/cbor2/encoder.py
rename to python-ecosys/cbor2/cbor2/_encoder.py
diff --git a/python-ecosys/cbor2/examples/cbor_test.py b/python-ecosys/cbor2/examples/cbor_test.py
index 79ae6089e..b4f351786 100644
--- a/python-ecosys/cbor2/examples/cbor_test.py
+++ b/python-ecosys/cbor2/examples/cbor_test.py
@@ -24,16 +24,15 @@
 """
 
 
-from cbor2 import encoder
-from cbor2 import decoder
+import cbor2
 
 input = [
     {"bn": "urn:dev:ow:10e2073a01080063", "u": "Cel", "t": 1.276020076e09, "v": 23.5},
     {"u": "Cel", "t": 1.276020091e09, "v": 23.6},
 ]
 
-data = encoder.dumps(input)
+data = cbor2.dumps(input)
 print(data)
 print(data.hex())
-text = decoder.loads(data)
+text = cbor2.loads(data)
 print(text)
diff --git a/python-ecosys/cbor2/manifest.py b/python-ecosys/cbor2/manifest.py
index b94ecc886..aa4b77092 100644
--- a/python-ecosys/cbor2/manifest.py
+++ b/python-ecosys/cbor2/manifest.py
@@ -1,3 +1,3 @@
-metadata(version="0.1.0", pypi="cbor2")
+metadata(version="1.0.0", pypi="cbor2")
 
 package("cbor2")