diff --git a/src/core.rs b/src/core.rs
index 2b2faf0..30a69b6 100644
--- a/src/core.rs
+++ b/src/core.rs
@@ -2,12 +2,15 @@
 //! Brings [`Mentionable`]/[`Factory`]/[`Origin`] concepts from the original implementation in Python.
 //! Allows for more generic behaviour via [`Context`], as opposed to original async-only.
 
+mod addresses;
 mod hashing;
 mod resolution;
+mod resolver_origin;
 mod serialization;
 mod slice_deserializer;
 mod typeless;
 
+pub use addresses::*;
 pub use hashing::*;
 pub use resolution::*;
 pub use serialization::*;
diff --git a/src/core/addresses.rs b/src/core/addresses.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/core/resolution.rs b/src/core/resolution.rs
index e49f74f..c051e06 100644
--- a/src/core/resolution.rs
+++ b/src/core/resolution.rs
@@ -41,24 +41,6 @@ pub trait Resolver<'a, Ctx: 'a + Context>: 'a {
     fn resolve(self: Rc<Self>, address: Address) -> HashResolution<'a, Ctx>;
 }
 
-impl<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>> Point<'a, Ctx, A> {
-    /// Make a [Point] from an [Address].
-    pub fn from_address(
-        address: Address,
-        factory: A::Fctr,
-        resolver: Rc<dyn Resolver<'a, Ctx>>,
-    ) -> Self {
-        Point {
-            point: address.point,
-            origin: Rc::new(ResolverOrigin {
-                r_factory: factory,
-                r_address: address,
-                r_resolver: resolver,
-            }),
-        }
-    }
-}
-
 /// Preferred way to parse [Point]s off of a [Serializer].
 pub struct Addresses {
     current: usize,
@@ -99,40 +81,6 @@ impl Addresses {
     }
 }
 
-struct ResolverOrigin<'a, Ctx: 'a + Context, F: Factory<'a, Ctx>> {
-    r_factory: F,
-    r_address: Address,
-    r_resolver: Rc<dyn Resolver<'a, Ctx>>,
-}
-
-fn _resolve_origin<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>>(
-    origin: Rc<ResolverOrigin<'a, Ctx, A::Fctr>>,
-) -> Resolution<'a, Ctx, A> {
-    let resolution = origin.r_resolver.clone().resolve(origin.r_address);
-    Ctx::T::fmap(
-        move |resolved| match resolved {
-            Ok((src, resolver)) => match origin.r_factory.parse_slice(&src, resolver) {
-                Ok(mentionable) => Ok(Rc::new(mentionable)),
-                Err(parse_error) => Err(ResolutionError::Parse(parse_error)),
-            },
-            Err(lookup_error) => Err(ResolutionError::Lookup(lookup_error)),
-        },
-        resolution,
-    )
-}
-
-impl<'a, Ctx: 'a + Context, F: Factory<'a, Ctx>> Origin<'a, Ctx> for ResolverOrigin<'a, Ctx, F> {
-    type Mtbl = F::Mtbl;
-
-    fn factory(&self) -> <Self::Mtbl as Mentionable<'a, Ctx>>::Fctr {
-        self.r_factory.clone()
-    }
-
-    fn resolve(self: Rc<Self>) -> Resolution<'a, Ctx, Self::Mtbl> {
-        _resolve_origin(self)
-    }
-}
-
 fn _parse_slice<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>>(
     factory: &A::Fctr,
     slice: &[u8],
diff --git a/src/core/resolver_origin.rs b/src/core/resolver_origin.rs
new file mode 100644
index 0000000..b1c4b36
--- /dev/null
+++ b/src/core/resolver_origin.rs
@@ -0,0 +1,53 @@
+use super::*;
+
+impl<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>> Point<'a, Ctx, A> {
+    /// Make a [Point] from an [Address].
+    pub fn from_address(
+        address: Address,
+        factory: A::Fctr,
+        resolver: Rc<dyn Resolver<'a, Ctx>>,
+    ) -> Self {
+        Point {
+            point: address.point,
+            origin: Rc::new(ResolverOrigin {
+                r_factory: factory,
+                r_address: address,
+                r_resolver: resolver,
+            }),
+        }
+    }
+}
+
+struct ResolverOrigin<'a, Ctx: 'a + Context, F: Factory<'a, Ctx>> {
+    r_factory: F,
+    r_address: Address,
+    r_resolver: Rc<dyn Resolver<'a, Ctx>>,
+}
+
+fn _resolve_origin<'a, Ctx: 'a + Context, A: Mentionable<'a, Ctx>>(
+    origin: Rc<ResolverOrigin<'a, Ctx, A::Fctr>>,
+) -> Resolution<'a, Ctx, A> {
+    let resolution = origin.r_resolver.clone().resolve(origin.r_address);
+    Ctx::T::fmap(
+        move |resolved| match resolved {
+            Ok((src, resolver)) => match origin.r_factory.parse_slice(&src, resolver) {
+                Ok(mentionable) => Ok(Rc::new(mentionable)),
+                Err(parse_error) => Err(ResolutionError::Parse(parse_error)),
+            },
+            Err(lookup_error) => Err(ResolutionError::Lookup(lookup_error)),
+        },
+        resolution,
+    )
+}
+
+impl<'a, Ctx: 'a + Context, F: Factory<'a, Ctx>> Origin<'a, Ctx> for ResolverOrigin<'a, Ctx, F> {
+    type Mtbl = F::Mtbl;
+
+    fn factory(&self) -> <Self::Mtbl as Mentionable<'a, Ctx>>::Fctr {
+        self.r_factory.clone()
+    }
+
+    fn resolve(self: Rc<Self>) -> Resolution<'a, Ctx, Self::Mtbl> {
+        _resolve_origin(self)
+    }
+}