diff --git a/activitystreams-types/src/activity/accept.rs b/activitystreams-types/src/activity/accept.rs
index 0e3e27c..7d50a5a 100644
--- a/activitystreams-types/src/activity/accept.rs
+++ b/activitystreams-types/src/activity/accept.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::AcceptType,
-    properties::{AcceptProperties, ActivityExt, ActivityProperties},
+    properties::{AcceptProperties, ActivityProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor accepts the object.
 ///
diff --git a/activitystreams-types/src/activity/add.rs b/activitystreams-types/src/activity/add.rs
index d0af5b5..6ec50b2 100644
--- a/activitystreams-types/src/activity/add.rs
+++ b/activitystreams-types/src/activity/add.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::AddType,
-    properties::{ActivityExt, ActivityProperties, AddProperties},
+    properties::{ActivityProperties, AddProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has added the object to the target.
 ///
diff --git a/activitystreams-types/src/activity/amove.rs b/activitystreams-types/src/activity/amove.rs
index 9c410f2..fd9156d 100644
--- a/activitystreams-types/src/activity/amove.rs
+++ b/activitystreams-types/src/activity/amove.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::MoveType,
-    properties::{ActivityExt, ActivityProperties, MoveProperties},
+    properties::{ActivityProperties, MoveProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has moved object from origin to target.
 ///
diff --git a/activitystreams-types/src/activity/announce.rs b/activitystreams-types/src/activity/announce.rs
index c31b719..6e2bd4e 100644
--- a/activitystreams-types/src/activity/announce.rs
+++ b/activitystreams-types/src/activity/announce.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::AnnounceType,
-    properties::{ActivityExt, ActivityProperties, AnnounceProperties},
+    properties::{ActivityProperties, AnnounceProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is calling the target's attention the object.
 ///
diff --git a/activitystreams-types/src/activity/arrive.rs b/activitystreams-types/src/activity/arrive.rs
index cb03498..5c81e70 100644
--- a/activitystreams-types/src/activity/arrive.rs
+++ b/activitystreams-types/src/activity/arrive.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, IntransitiveActivity, Object};
 
 use super::{
     kind::ArriveType,
-    properties::{ActivityExt, ActivityProperties, ArriveProperties},
+    properties::{ActivityProperties, ArriveProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// An IntransitiveActivity that indicates that the actor has arrived at the location.
 ///
diff --git a/activitystreams-types/src/activity/block.rs b/activitystreams-types/src/activity/block.rs
index a11df11..591692d 100644
--- a/activitystreams-types/src/activity/block.rs
+++ b/activitystreams-types/src/activity/block.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::BlockType,
-    properties::{ActivityExt, ActivityProperties, BlockProperties},
+    properties::{ActivityProperties, BlockProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is blocking the object.
 ///
diff --git a/activitystreams-types/src/activity/create.rs b/activitystreams-types/src/activity/create.rs
index 8451e07..5eb7b0b 100644
--- a/activitystreams-types/src/activity/create.rs
+++ b/activitystreams-types/src/activity/create.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::CreateType,
-    properties::{ActivityExt, ActivityProperties, CreateProperties},
+    properties::{ActivityProperties, CreateProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has created the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/activity/delete.rs b/activitystreams-types/src/activity/delete.rs
index 03fa61a..e37aaab 100644
--- a/activitystreams-types/src/activity/delete.rs
+++ b/activitystreams-types/src/activity/delete.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::DeleteType,
-    properties::{ActivityExt, ActivityProperties, DeleteProperties},
+    properties::{ActivityProperties, DeleteProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has deleted the object.
 ///
diff --git a/activitystreams-types/src/activity/dislike.rs b/activitystreams-types/src/activity/dislike.rs
index 86810b6..068c88f 100644
--- a/activitystreams-types/src/activity/dislike.rs
+++ b/activitystreams-types/src/activity/dislike.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::DislikeType,
-    properties::{ActivityExt, ActivityProperties, DislikeProperties},
+    properties::{ActivityProperties, DislikeProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor dislikes the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/activity/flag.rs b/activitystreams-types/src/activity/flag.rs
index f126b43..1f81095 100644
--- a/activitystreams-types/src/activity/flag.rs
+++ b/activitystreams-types/src/activity/flag.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::FlagType,
-    properties::{ActivityExt, ActivityProperties, FlagProperties},
+    properties::{ActivityProperties, FlagProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is "flagging" the object.
 ///
diff --git a/activitystreams-types/src/activity/follow.rs b/activitystreams-types/src/activity/follow.rs
index c0c1769..c7ac44f 100644
--- a/activitystreams-types/src/activity/follow.rs
+++ b/activitystreams-types/src/activity/follow.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::FollowType,
-    properties::{ActivityExt, ActivityProperties, FollowProperties},
+    properties::{ActivityProperties, FollowProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is "following" the object.
 ///
diff --git a/activitystreams-types/src/activity/ignore.rs b/activitystreams-types/src/activity/ignore.rs
index 1f7e8f4..a5992c4 100644
--- a/activitystreams-types/src/activity/ignore.rs
+++ b/activitystreams-types/src/activity/ignore.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::IgnoreType,
-    properties::{ActivityExt, ActivityProperties, IgnoreProperties},
+    properties::{ActivityProperties, IgnoreProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is ignoring the object.
 ///
diff --git a/activitystreams-types/src/activity/invite.rs b/activitystreams-types/src/activity/invite.rs
index 4974099..bde27e6 100644
--- a/activitystreams-types/src/activity/invite.rs
+++ b/activitystreams-types/src/activity/invite.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::InviteType,
-    properties::{ActivityExt, ActivityProperties, InviteProperties},
+    properties::{ActivityProperties, InviteProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// A specialization of Offer in which the actor is extending an invitation for the object to the
 /// target.
diff --git a/activitystreams-types/src/activity/join.rs b/activitystreams-types/src/activity/join.rs
index 083607a..513aecf 100644
--- a/activitystreams-types/src/activity/join.rs
+++ b/activitystreams-types/src/activity/join.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::JoinType,
-    properties::{ActivityExt, ActivityProperties, JoinProperties},
+    properties::{ActivityProperties, JoinProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has joined the object.
 ///
diff --git a/activitystreams-types/src/activity/leave.rs b/activitystreams-types/src/activity/leave.rs
index 28b6a53..1622ae4 100644
--- a/activitystreams-types/src/activity/leave.rs
+++ b/activitystreams-types/src/activity/leave.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::LeaveType,
-    properties::{ActivityExt, ActivityProperties, LeaveProperties},
+    properties::{ActivityProperties, LeaveProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has left the object.
 ///
diff --git a/activitystreams-types/src/activity/like.rs b/activitystreams-types/src/activity/like.rs
index a93ff2a..406f024 100644
--- a/activitystreams-types/src/activity/like.rs
+++ b/activitystreams-types/src/activity/like.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::LikeType,
-    properties::{ActivityExt, ActivityProperties, LikeProperties},
+    properties::{ActivityProperties, LikeProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor likes, recommends or endorses the object.
 ///
diff --git a/activitystreams-types/src/activity/listen.rs b/activitystreams-types/src/activity/listen.rs
index ecfc519..aa14be9 100644
--- a/activitystreams-types/src/activity/listen.rs
+++ b/activitystreams-types/src/activity/listen.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::ListenType,
-    properties::{ActivityExt, ActivityProperties, ListenProperties},
+    properties::{ActivityProperties, ListenProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has listened to the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/activity/mod.rs b/activitystreams-types/src/activity/mod.rs
index 239d5ab..9700001 100644
--- a/activitystreams-types/src/activity/mod.rs
+++ b/activitystreams-types/src/activity/mod.rs
@@ -76,3 +76,12 @@ pub use self::travel::*;
 pub use self::undo::*;
 pub use self::update::*;
 pub use self::view::*;
+
+use activitystreams_traits::Activity;
+
+use self::properties::ActivityProperties;
+
+pub trait ActivityExt: Activity {
+    fn props(&self) -> &ActivityProperties;
+    fn props_mut(&mut self) -> &mut ActivityProperties;
+}
diff --git a/activitystreams-types/src/activity/offer.rs b/activitystreams-types/src/activity/offer.rs
index de39282..b340cae 100644
--- a/activitystreams-types/src/activity/offer.rs
+++ b/activitystreams-types/src/activity/offer.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::OfferType,
-    properties::{ActivityExt, ActivityProperties, OfferProperties},
+    properties::{ActivityProperties, OfferProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is offering the object.
 ///
diff --git a/activitystreams-types/src/activity/properties.rs b/activitystreams-types/src/activity/properties.rs
index 1192037..6e8216b 100644
--- a/activitystreams-types/src/activity/properties.rs
+++ b/activitystreams-types/src/activity/properties.rs
@@ -56,14 +56,9 @@
 //! # fn main() {}
 //! ```
 
-use activitystreams_traits::{Activity, Link, Object};
+use activitystreams_traits::{Link, Object};
 use serde_json;
 
-pub trait ActivityExt: Activity {
-    fn props(&self) -> &ActivityProperties;
-    fn props_mut(&mut self) -> &mut ActivityProperties;
-}
-
 /// Activity objects are specializations of the base Object type that provide information about
 /// actions that have either already occurred, are in the process of occurring, or may occur in the
 /// future.
diff --git a/activitystreams-types/src/activity/question.rs b/activitystreams-types/src/activity/question.rs
index 5e2fa83..b3230ff 100644
--- a/activitystreams-types/src/activity/question.rs
+++ b/activitystreams-types/src/activity/question.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, IntransitiveActivity, Object};
 
 use super::{
     kind::QuestionType,
-    properties::{ActivityExt, ActivityProperties, QuestionProperties},
+    properties::{ActivityProperties, QuestionProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Represents a question being asked.
 ///
diff --git a/activitystreams-types/src/activity/read.rs b/activitystreams-types/src/activity/read.rs
index c64a80a..7d51410 100644
--- a/activitystreams-types/src/activity/read.rs
+++ b/activitystreams-types/src/activity/read.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::ReadType,
-    properties::{ActivityExt, ActivityProperties, ReadProperties},
+    properties::{ActivityProperties, ReadProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has read the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/activity/reject.rs b/activitystreams-types/src/activity/reject.rs
index c95f471..e638422 100644
--- a/activitystreams-types/src/activity/reject.rs
+++ b/activitystreams-types/src/activity/reject.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::RejectType,
-    properties::{ActivityExt, ActivityProperties, RejectProperties},
+    properties::{ActivityProperties, RejectProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is rejecting the object.
 ///
diff --git a/activitystreams-types/src/activity/remove.rs b/activitystreams-types/src/activity/remove.rs
index a498dae..0feb67f 100644
--- a/activitystreams-types/src/activity/remove.rs
+++ b/activitystreams-types/src/activity/remove.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::RemoveType,
-    properties::{ActivityExt, ActivityProperties, RemoveProperties},
+    properties::{ActivityProperties, RemoveProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is removing the object.
 ///
diff --git a/activitystreams-types/src/activity/tentative_accept.rs b/activitystreams-types/src/activity/tentative_accept.rs
index e68e1dd..4e65227 100644
--- a/activitystreams-types/src/activity/tentative_accept.rs
+++ b/activitystreams-types/src/activity/tentative_accept.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::TentativeAcceptType,
-    properties::{ActivityExt, ActivityProperties, TentativeAcceptProperties},
+    properties::{ActivityProperties, TentativeAcceptProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// A specialization of Accept indicating that the acceptance is tentative.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/activity/tentative_reject.rs b/activitystreams-types/src/activity/tentative_reject.rs
index 4af818e..9160c0f 100644
--- a/activitystreams-types/src/activity/tentative_reject.rs
+++ b/activitystreams-types/src/activity/tentative_reject.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::TentativeRejectType,
-    properties::{ActivityExt, ActivityProperties, TentativeRejectProperties},
+    properties::{ActivityProperties, TentativeRejectProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// A specialization of Reject in which the rejection is considered tentative.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/activity/travel.rs b/activitystreams-types/src/activity/travel.rs
index 170d0ed..abc0b8a 100644
--- a/activitystreams-types/src/activity/travel.rs
+++ b/activitystreams-types/src/activity/travel.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, IntransitiveActivity, Object};
 
 use super::{
     kind::TravelType,
-    properties::{ActivityExt, ActivityProperties, TravelProperties},
+    properties::{ActivityProperties, TravelProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is traveling to target from origin.
 ///
diff --git a/activitystreams-types/src/activity/undo.rs b/activitystreams-types/src/activity/undo.rs
index 9503e96..7285012 100644
--- a/activitystreams-types/src/activity/undo.rs
+++ b/activitystreams-types/src/activity/undo.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::UndoType,
-    properties::{ActivityExt, ActivityProperties, UndoProperties},
+    properties::{ActivityProperties, UndoProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor is undoing the object.
 ///
diff --git a/activitystreams-types/src/activity/update.rs b/activitystreams-types/src/activity/update.rs
index 443dbcd..a4d6605 100644
--- a/activitystreams-types/src/activity/update.rs
+++ b/activitystreams-types/src/activity/update.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::UpdateType,
-    properties::{ActivityExt, ActivityProperties, UpdateProperties},
+    properties::{ActivityProperties, UpdateProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has updated the object.
 ///
diff --git a/activitystreams-types/src/activity/view.rs b/activitystreams-types/src/activity/view.rs
index 11b70fd..c9b1336 100644
--- a/activitystreams-types/src/activity/view.rs
+++ b/activitystreams-types/src/activity/view.rs
@@ -21,9 +21,10 @@ use activitystreams_traits::{Activity, Object};
 
 use super::{
     kind::ViewType,
-    properties::{ActivityExt, ActivityProperties, ViewProperties},
+    properties::{ActivityProperties, ViewProperties},
+    ActivityExt,
 };
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 /// Indicates that the actor has viewed the object.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
diff --git a/activitystreams-types/src/actor/mod.rs b/activitystreams-types/src/actor/mod.rs
index 970f765..72893a2 100644
--- a/activitystreams-types/src/actor/mod.rs
+++ b/activitystreams-types/src/actor/mod.rs
@@ -21,7 +21,7 @@
 
 use activitystreams_traits::{Actor, Object};
 
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 pub mod kind;
 use self::kind::*;
diff --git a/activitystreams-types/src/collection/mod.rs b/activitystreams-types/src/collection/mod.rs
index a9dc4e6..bb61930 100644
--- a/activitystreams-types/src/collection/mod.rs
+++ b/activitystreams-types/src/collection/mod.rs
@@ -21,13 +21,23 @@
 
 use activitystreams_traits::{Collection, CollectionPage, Object};
 
-use object::properties::{ObjectExt, ObjectProperties};
+use object::{properties::ObjectProperties, ObjectExt};
 
 pub mod kind;
 pub mod properties;
 use self::kind::*;
 use self::properties::*;
 
+pub trait CollectionExt: Collection {
+    fn props(&self) -> &CollectionProperties;
+    fn props_mut(&mut self) -> &mut CollectionProperties;
+}
+
+pub trait CollectionPageExt: CollectionPage {
+    fn props(&self) -> &CollectionPageProperties;
+    fn props_mut(&mut self) -> &mut CollectionPageProperties;
+}
+
 /// The default `Collection` type.
 #[derive(Clone, Debug, Default, Deserialize, Serialize, Properties)]
 #[serde(rename_all = "camelCase")]
diff --git a/activitystreams-types/src/collection/properties.rs b/activitystreams-types/src/collection/properties.rs
index 88e4b65..f5bb135 100644
--- a/activitystreams-types/src/collection/properties.rs
+++ b/activitystreams-types/src/collection/properties.rs
@@ -59,16 +59,6 @@
 use activitystreams_traits::{Collection, CollectionPage, Link, Object};
 use serde_json;
 
-pub trait CollectionExt {
-    fn props(&self) -> &CollectionProperties;
-    fn props_mut(&mut self) -> &mut CollectionProperties;
-}
-
-pub trait CollectionPageExt {
-    fn props(&self) -> &CollectionPageProperties;
-    fn props_mut(&mut self) -> &mut CollectionPageProperties;
-}
-
 /// `Collection` objects are a specialization of the base `Object` that serve as a container for
 /// other `Objects` or `Links`.
 ///
diff --git a/activitystreams-types/src/link/mod.rs b/activitystreams-types/src/link/mod.rs
index 910ac84..5e20861 100644
--- a/activitystreams-types/src/link/mod.rs
+++ b/activitystreams-types/src/link/mod.rs
@@ -26,6 +26,11 @@ pub mod properties;
 use self::kind::*;
 use self::properties::*;
 
+pub trait LinkExt: Link {
+    fn props(&self) -> &LinkProperties;
+    fn props_mut(&mut self) -> &mut LinkProperties;
+}
+
 /// A specialized Link that represents an @mention.
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/activitystreams-types/src/link/properties.rs b/activitystreams-types/src/link/properties.rs
index b2d55f5..4879f21 100644
--- a/activitystreams-types/src/link/properties.rs
+++ b/activitystreams-types/src/link/properties.rs
@@ -53,11 +53,6 @@ use activitystreams_traits::{Error, Link, Object, Result};
 use mime;
 use serde_json;
 
-pub trait LinkExt {
-    fn props(&self) -> &LinkProperties;
-    fn props_mut(&mut self) -> &mut LinkProperties;
-}
-
 /// Define all the properties of the Object base type as described by the Activity Streams
 /// vocabulary.
 ///
diff --git a/activitystreams-types/src/object/mod.rs b/activitystreams-types/src/object/mod.rs
index db7d059..0d2de44 100644
--- a/activitystreams-types/src/object/mod.rs
+++ b/activitystreams-types/src/object/mod.rs
@@ -26,6 +26,11 @@ pub mod properties;
 use self::kind::*;
 use self::properties::*;
 
+pub trait ObjectExt: Object {
+    fn props(&self) -> &ObjectProperties;
+    fn props_mut(&mut self) -> &mut ObjectProperties;
+}
+
 /// Represents any kind of multi-paragraph written work.
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
diff --git a/activitystreams-types/src/object/properties.rs b/activitystreams-types/src/object/properties.rs
index e77e191..a08df67 100644
--- a/activitystreams-types/src/object/properties.rs
+++ b/activitystreams-types/src/object/properties.rs
@@ -56,11 +56,6 @@ use serde_json;
 
 use object::Image;
 
-pub trait ObjectExt {
-    fn props(&self) -> &ObjectProperties;
-    fn props_mut(&mut self) -> &mut ObjectProperties;
-}
-
 /// Alias chrono::DateTime<Utc> for use in derive macros
 pub type UtcTime = DateTime<Utc>;
 
diff --git a/src/activity.rs b/src/activity.rs
index aba1cf1..7222a23 100644
--- a/src/activity.rs
+++ b/src/activity.rs
@@ -21,9 +21,7 @@
 
 pub use activitystreams_traits::{Activity, IntransitiveActivity};
 pub use activitystreams_types::activity::{
-    kind,
-    properties::{self, ActivityExt},
-    AMove, Accept, Add, Announce, Arrive, Block, Create, Delete, Dislike, Flag, Follow, Ignore,
-    Invite, Join, Leave, Like, Listen, Offer, Question, Read, Reject, Remove, TentativeAccept,
-    TentativeReject, Travel, Undo, Update, View,
+    kind, properties, AMove, Accept, ActivityExt, Add, Announce, Arrive, Block, Create, Delete,
+    Dislike, Flag, Follow, Ignore, Invite, Join, Leave, Like, Listen, Offer, Question, Read,
+    Reject, Remove, TentativeAccept, TentativeReject, Travel, Undo, Update, View,
 };
diff --git a/src/collection.rs b/src/collection.rs
index d55ec22..85da963 100644
--- a/src/collection.rs
+++ b/src/collection.rs
@@ -21,7 +21,6 @@
 
 pub use activitystreams_traits::{Collection, CollectionPage};
 pub use activitystreams_types::collection::{
-    kind,
-    properties::{self, CollectionExt, CollectionPageExt},
-    OrderedCollection, OrderedCollectionPage, UnorderedCollection, UnorderedCollectionPage,
+    kind, properties, CollectionExt, CollectionPageExt, OrderedCollection, OrderedCollectionPage,
+    UnorderedCollection, UnorderedCollectionPage,
 };
diff --git a/src/link.rs b/src/link.rs
index 0adf29d..691caf7 100644
--- a/src/link.rs
+++ b/src/link.rs
@@ -20,8 +20,4 @@
 //! Link traits and types
 
 pub use activitystreams_traits::Link;
-pub use activitystreams_types::link::{
-    kind,
-    properties::{self, LinkExt},
-    Mention,
-};
+pub use activitystreams_types::link::{kind, properties, LinkExt, Mention};
diff --git a/src/object.rs b/src/object.rs
index 97d0d29..990a436 100644
--- a/src/object.rs
+++ b/src/object.rs
@@ -21,8 +21,6 @@
 
 pub use activitystreams_traits::Object;
 pub use activitystreams_types::object::{
-    kind,
-    properties::{self, ObjectExt},
-    Article, Audio, Document, Event, Image, Note, Page, Place, Profile, Relationship, Tombstone,
-    Video,
+    kind, properties, Article, Audio, Document, Event, Image, Note, ObjectExt, Page, Place,
+    Profile, Relationship, Tombstone, Video,
 };