3 files changed, 16 insertions, 12 deletions
diff --git a/bsie/extractor/generic/constant.py b/bsie/extractor/generic/constant.py
index 11384e6..7b1d942 100644
--- a/bsie/extractor/generic/constant.py
+++ b/bsie/extractor/generic/constant.py
@@ -4,13 +4,15 @@ Part of the bsie module.
 A copy of the license is provided with the project.
 Author: Matthias Baumgartner, 2022
 """
-# imports
+# standard imports
 import typing
 
 # bsie imports
-from bsie.base import extractor
 from bsie.utils import bsfs, node
 
+# inner-module imports
+from .. import base
+
 # exports
 __all__: typing.Sequence[str] = (
     'Constant',
@@ -19,7 +21,7 @@ __all__: typing.Sequence[str] = (
 
 ## code ##
 
-class Constant(extractor.Extractor):
+class Constant(base.Extractor):
     """Extract information from file's path."""
 
     CONTENT_READER = None
@@ -32,7 +34,7 @@ class Constant(extractor.Extractor):
             schema: str,
             tuples: typing.Iterable[typing.Tuple[bsfs.URI, typing.Any]],
             ):
-        super().__init__(bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + schema))
+        super().__init__(bsfs.schema.Schema.from_string(base.SCHEMA_PREAMBLE + schema))
         # NOTE: Raises a KeyError if the predicate is not part of the schema
         self._tuples = tuple((self.schema.predicate(p_uri), value) for p_uri, value in tuples)
         # TODO: use schema instance for value checking
diff --git a/bsie/extractor/generic/path.py b/bsie/extractor/generic/path.py
index 7018e12..295715f 100644
--- a/bsie/extractor/generic/path.py
+++ b/bsie/extractor/generic/path.py
@@ -4,12 +4,12 @@ Part of the bsie module.
 A copy of the license is provided with the project.
 Author: Matthias Baumgartner, 2022
 """
-# imports
+# standard imports
 import os
 import typing
 
 # bsie imports
-from bsie.base import extractor
+from bsie.extractor import base
 from bsie.utils import bsfs, node, ns
 
 # exports
@@ -20,7 +20,7 @@ __all__: typing.Sequence[str] = (
 
 ## code ##
 
-class Path(extractor.Extractor):
+class Path(base.Extractor):
     """Extract information from file's path."""
 
     CONTENT_READER = 'bsie.reader.path.Path'
@@ -29,7 +29,7 @@ class Path(extractor.Extractor):
     _callmap: typing.Dict[bsfs.schema.Predicate, typing.Callable[[str], typing.Any]]
 
     def __init__(self):
-        super().__init__(bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        super().__init__(bsfs.schema.Schema.from_string(base.SCHEMA_PREAMBLE + '''
             bse:filename rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:File ;
                 rdfs:range xsd:string ;
diff --git a/bsie/extractor/generic/stat.py b/bsie/extractor/generic/stat.py
index 0b9ce29..1381fe2 100644
--- a/bsie/extractor/generic/stat.py
+++ b/bsie/extractor/generic/stat.py
@@ -4,14 +4,16 @@ Part of the bsie module.
 A copy of the license is provided with the project.
 Author: Matthias Baumgartner, 2022
 """
-# imports
+# standard imports
 import os
 import typing
 
 # bsie imports
-from bsie.base import extractor
 from bsie.utils import bsfs, node, ns
 
+# inner-module imports
+from .. import base
+
 # exports
 __all__: typing.Sequence[str] = (
     'Stat',
@@ -20,7 +22,7 @@ __all__: typing.Sequence[str] = (
 
 ## code ##
 
-class Stat(extractor.Extractor):
+class Stat(base.Extractor):
     """Extract information from the file system."""
 
     CONTENT_READER = 'bsie.reader.stat.Stat'
@@ -29,7 +31,7 @@ class Stat(extractor.Extractor):
     _callmap: typing.Dict[bsfs.schema.Predicate, typing.Callable[[os.stat_result], typing.Any]]
 
     def __init__(self):
-        super().__init__(bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+        super().__init__(bsfs.schema.Schema.from_string(base.SCHEMA_PREAMBLE + '''
             bse:filesize rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:File ;
                 rdfs:range xsd:integer ;