diff --git a/crates/metaslang/bindings/generated/public_api.txt b/crates/metaslang/bindings/generated/public_api.txt
index 933cdfd4ad..380b348f20 100644
--- a/crates/metaslang/bindings/generated/public_api.txt
+++ b/crates/metaslang/bindings/generated/public_api.txt
@@ -11,16 +11,6 @@ impl<KT: core::clone::Clone + metaslang_cst::kinds::KindTypes + 'static> core::c
 pub fn metaslang_bindings::BindingLocation<KT>::clone(&self) -> metaslang_bindings::BindingLocation<KT>
 impl<KT: core::fmt::Debug + metaslang_cst::kinds::KindTypes + 'static> core::fmt::Debug for metaslang_bindings::BindingLocation<KT>
 pub fn metaslang_bindings::BindingLocation<KT>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub enum metaslang_bindings::FileDescriptor
-pub metaslang_bindings::FileDescriptor::System(alloc::string::String)
-pub metaslang_bindings::FileDescriptor::User(alloc::string::String)
-impl metaslang_bindings::FileDescriptor
-pub fn metaslang_bindings::FileDescriptor::get_path(&self) -> &str
-pub fn metaslang_bindings::FileDescriptor::is_system(&self) -> bool
-pub fn metaslang_bindings::FileDescriptor::is_user(&self) -> bool
-pub fn metaslang_bindings::FileDescriptor::is_user_path(&self, path: &str) -> bool
-impl core::clone::Clone for metaslang_bindings::FileDescriptor
-pub fn metaslang_bindings::FileDescriptor::clone(&self) -> metaslang_bindings::FileDescriptor
 pub struct metaslang_bindings::BindingGraph<KT: metaslang_cst::kinds::KindTypes + 'static>
 impl<KT: metaslang_cst::kinds::KindTypes + 'static> metaslang_bindings::BindingGraph<KT>
 pub fn metaslang_bindings::BindingGraph<KT>::all_definitions(self: &alloc::rc::Rc<Self>) -> impl core::iter::traits::iterator::Iterator<Item = metaslang_bindings::Definition<KT>> + '_
@@ -44,7 +34,7 @@ impl<KT: metaslang_cst::kinds::KindTypes + 'static> metaslang_bindings::Definiti
 pub fn metaslang_bindings::Definition<KT>::definiens_location(&self) -> metaslang_bindings::BindingLocation<KT>
 pub fn metaslang_bindings::Definition<KT>::get_cursor(&self) -> &metaslang_cst::cursor::Cursor<KT>
 pub fn metaslang_bindings::Definition<KT>::get_definiens_cursor(&self) -> &metaslang_cst::cursor::Cursor<KT>
-pub fn metaslang_bindings::Definition<KT>::get_file(&self) -> metaslang_bindings::FileDescriptor
+pub fn metaslang_bindings::Definition<KT>::get_file(&self) -> FileDescriptor
 pub fn metaslang_bindings::Definition<KT>::id(&self) -> usize
 pub fn metaslang_bindings::Definition<KT>::name_location(&self) -> metaslang_bindings::BindingLocation<KT>
 impl<KT: core::clone::Clone + metaslang_cst::kinds::KindTypes + 'static> core::clone::Clone for metaslang_bindings::Definition<KT>
@@ -60,7 +50,7 @@ pub struct metaslang_bindings::Reference<KT: metaslang_cst::kinds::KindTypes + '
 impl<KT: metaslang_cst::kinds::KindTypes + 'static> metaslang_bindings::Reference<KT>
 pub fn metaslang_bindings::Reference<KT>::definitions(&self) -> alloc::vec::Vec<metaslang_bindings::Definition<KT>>
 pub fn metaslang_bindings::Reference<KT>::get_cursor(&self) -> &metaslang_cst::cursor::Cursor<KT>
-pub fn metaslang_bindings::Reference<KT>::get_file(&self) -> metaslang_bindings::FileDescriptor
+pub fn metaslang_bindings::Reference<KT>::get_file(&self) -> FileDescriptor
 pub fn metaslang_bindings::Reference<KT>::id(&self) -> usize
 pub fn metaslang_bindings::Reference<KT>::location(&self) -> metaslang_bindings::BindingLocation<KT>
 impl<KT: core::clone::Clone + metaslang_cst::kinds::KindTypes + 'static> core::clone::Clone for metaslang_bindings::Reference<KT>
diff --git a/crates/solidity/outputs/cargo/crate/generated/public_api.txt b/crates/solidity/outputs/cargo/crate/generated/public_api.txt
index befd301544..5f04220c33 100644
--- a/crates/solidity/outputs/cargo/crate/generated/public_api.txt
+++ b/crates/solidity/outputs/cargo/crate/generated/public_api.txt
@@ -16,14 +16,14 @@ impl core::fmt::Debug for slang_solidity::bindings::BindingGraphInitializationEr
 pub fn slang_solidity::bindings::BindingGraphInitializationError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 impl core::fmt::Display for slang_solidity::bindings::BindingGraphInitializationError
 pub fn slang_solidity::bindings::BindingGraphInitializationError::fmt(&self, __formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn slang_solidity::bindings::create_with_resolver(version: semver::Version, resolver: alloc::rc::Rc<dyn metaslang_bindings::PathResolver<slang_solidity::cst::KindTypes>>) -> core::result::Result<slang_solidity::bindings::BindingGraphBuilder, slang_solidity::parser::ParserInitializationError>
+pub fn slang_solidity::bindings::create_with_resolver(version: semver::Version, resolver: alloc::rc::Rc<dyn metaslang_bindings::builder::PathResolver<slang_solidity::cst::KindTypes>>) -> core::result::Result<slang_solidity::bindings::BindingGraphBuilder, slang_solidity::parser::ParserInitializationError>
 pub fn slang_solidity::bindings::get_binding_rules() -> &'static str
-pub type slang_solidity::bindings::BindingGraph = metaslang_bindings::resolved::BindingGraph<slang_solidity::cst::KindTypes>
-pub type slang_solidity::bindings::BindingGraphBuilder = metaslang_bindings::BindingGraphBuilder<slang_solidity::cst::KindTypes>
-pub type slang_solidity::bindings::BindingLocation = metaslang_bindings::location::BindingLocation<slang_solidity::cst::KindTypes>
-pub type slang_solidity::bindings::Definition = metaslang_bindings::resolved::Definition<slang_solidity::cst::KindTypes>
-pub type slang_solidity::bindings::Reference = metaslang_bindings::resolved::Reference<slang_solidity::cst::KindTypes>
-pub type slang_solidity::bindings::UserFileLocation = metaslang_bindings::location::UserFileLocation<slang_solidity::cst::KindTypes>
+pub type slang_solidity::bindings::BindingGraph = metaslang_bindings::graph::BindingGraph<slang_solidity::cst::KindTypes>
+pub type slang_solidity::bindings::BindingGraphBuilder = metaslang_bindings::builder::BindingGraphBuilder<slang_solidity::cst::KindTypes>
+pub type slang_solidity::bindings::BindingLocation = metaslang_bindings::graph::location::BindingLocation<slang_solidity::cst::KindTypes>
+pub type slang_solidity::bindings::Definition = metaslang_bindings::graph::definition::Definition<slang_solidity::cst::KindTypes>
+pub type slang_solidity::bindings::Reference = metaslang_bindings::graph::reference::Reference<slang_solidity::cst::KindTypes>
+pub type slang_solidity::bindings::UserFileLocation = metaslang_bindings::graph::location::UserFileLocation<slang_solidity::cst::KindTypes>
 pub mod slang_solidity::compilation
 pub struct slang_solidity::compilation::AddFileResponse
 pub slang_solidity::compilation::AddFileResponse::import_paths: alloc::vec::Vec<slang_solidity::cst::Cursor>