imports and init files

2 files changed, 8 insertions, 8 deletions

diff --git a/bsie/base/__init__.py b/bsie/base/__init__.py
index 0154862..0d362cd 100644
--- a/bsie/base/__init__.py
+++ b/bsie/base/__init__.py
@@ -11,14 +11,14 @@ import typing
 
 # inner-module imports
 from . import errors
-from . import extractor
-from . import reader
+from .extractor import Extractor
+from .reader import Reader
 
 # exports
 __all__: typing.Sequence[str] = (
+    'Extractor',
+    'Reader',
     'errors',
-    'extractor',
-    'reader',
     )
 
 ## EOF ##
diff --git a/bsie/base/reader.py b/bsie/base/reader.py
index b7eabf7..cbabd36 100644
--- a/bsie/base/reader.py
+++ b/bsie/base/reader.py
@@ -13,7 +13,7 @@ import abc
 import typing
 
 # bsie imports
-from bsie.utils.bsfs import URI, typename
+from bsie.utils import bsfs
 
 # exports
 __all__: typing.Sequence[str] = (
@@ -27,10 +27,10 @@ class Reader(abc.ABC):
     """Read and return some content from a file."""
 
     def __str__(self) -> str:
-        return typename(self)
+        return bsfs.typename(self)
 
     def __repr__(self) -> str:
-        return f'{typename(self)}()'
+        return f'{bsfs.typename(self)}()'
 
     def __eq__(self, other: typing.Any) -> bool:
         return isinstance(other, type(self))
@@ -39,7 +39,7 @@ class Reader(abc.ABC):
         return hash(type(self))
 
     @abc.abstractmethod
-    def __call__(self, path: URI) -> typing.Any:
+    def __call__(self, path: bsfs.URI) -> typing.Any:
         """Return some content of the file at *path*.
         Raises a `ReaderError` if the reader cannot make sense of the file format.
         """