3 files changed, 13 insertions, 9 deletions
diff --git a/bsie/extractor/generic/constant.py b/bsie/extractor/generic/constant.py
index 7acbe95..e038c0b 100644
--- a/bsie/extractor/generic/constant.py
+++ b/bsie/extractor/generic/constant.py
@@ -4,7 +4,8 @@
 import typing
 
 # bsie imports
-from bsie.utils import bsfs, node
+from bsie.matcher import nodes
+from bsie.utils import bsfs
 
 # inner-module imports
 from .. import base
@@ -44,10 +45,10 @@ class Constant(base.Extractor):
 
     def extract(
             self,
-            subject: node.Node,
+            subject: nodes.Entity,
             content: None,
             principals: typing.Iterable[bsfs.schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+            ) -> typing.Iterator[typing.Tuple[nodes.Node, bsfs.schema.Predicate, typing.Any]]:
         for pred, value in self._tuples:
             if pred in principals:
                 yield subject, pred, value
diff --git a/bsie/extractor/generic/path.py b/bsie/extractor/generic/path.py
index 30d75cf..7fe157b 100644
--- a/bsie/extractor/generic/path.py
+++ b/bsie/extractor/generic/path.py
@@ -5,7 +5,8 @@ import typing
 
 # bsie imports
 from bsie.extractor import base
-from bsie.utils import bsfs, node, ns
+from bsie.matcher import nodes
+from bsie.utils import bsfs, ns
 
 # exports
 __all__: typing.Sequence[str] = (
@@ -41,14 +42,15 @@ class Path(base.Extractor):
             '''))
         self._callmap = {
             self.schema.predicate(ns.bse.filename): self.__filename,
+            self.schema.predicate(ns.bse.dirname): self.__dirname,
             }
 
     def extract(
             self,
-            subject: node.Node,
+            subject: nodes.Entity,
             content: str,
             principals: typing.Iterable[bsfs.schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+            ) -> typing.Iterator[typing.Tuple[nodes.Node, bsfs.schema.Predicate, typing.Any]]:
         for pred in principals:
             # find callback
             clbk = self._callmap.get(pred)
diff --git a/bsie/extractor/generic/stat.py b/bsie/extractor/generic/stat.py
index 92b51f3..ff51cff 100644
--- a/bsie/extractor/generic/stat.py
+++ b/bsie/extractor/generic/stat.py
@@ -5,7 +5,8 @@ import os
 import typing
 
 # bsie imports
-from bsie.utils import bsfs, node, ns
+from bsie.matcher import nodes
+from bsie.utils import bsfs, ns
 
 # inner-module imports
 from .. import base
@@ -41,10 +42,10 @@ class Stat(base.Extractor):
 
     def extract(
             self,
-            subject: node.Node,
+            subject: nodes.Entity,
             content: os.stat_result,
             principals: typing.Iterable[bsfs.schema.Predicate],
-            ) -> typing.Iterator[typing.Tuple[node.Node, bsfs.schema.Predicate, typing.Any]]:
+            ) -> typing.Iterator[typing.Tuple[nodes.Node, bsfs.schema.Predicate, typing.Any]]:
         for pred in principals:
             # find callback
             clbk = self._callmap.get(pred)