diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Accept.kt b/src/main/kotlin/dev/usbharu/activitystreams/Accept.kt
deleted file mode 100644
index 4483185..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Accept.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Accept : Activity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Add.kt b/src/main/kotlin/dev/usbharu/activitystreams/Add.kt
deleted file mode 100644
index 61f0e4a..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Add.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Add : Activity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Announce.kt b/src/main/kotlin/dev/usbharu/activitystreams/Announce.kt
deleted file mode 100644
index fa575d4..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Announce.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Announce : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Application.kt b/src/main/kotlin/dev/usbharu/activitystreams/Application.kt
deleted file mode 100644
index 12ed13c..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Application.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Application : Object {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Arrive.kt b/src/main/kotlin/dev/usbharu/activitystreams/Arrive.kt
deleted file mode 100644
index cb02b35..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Arrive.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Arrive : IntransitiveActivity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Article.kt b/src/main/kotlin/dev/usbharu/activitystreams/Article.kt
deleted file mode 100644
index 260eaff..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Article.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Article : Object
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Audio.kt b/src/main/kotlin/dev/usbharu/activitystreams/Audio.kt
deleted file mode 100644
index 49cf97a..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Audio.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Audio : Document {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Block.kt b/src/main/kotlin/dev/usbharu/activitystreams/Block.kt
deleted file mode 100644
index 0e4e276..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Block.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Block : Ignore {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/CollectionPage.kt b/src/main/kotlin/dev/usbharu/activitystreams/CollectionPage.kt
deleted file mode 100644
index 0060593..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/CollectionPage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface CollectionPage : CollectionPageOrLink,Collection {
-    var partOf: CollectionOrLink?
-    var next: CollectionPageOrLink?
-    var prev: CollectionPageOrLink?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Create.kt b/src/main/kotlin/dev/usbharu/activitystreams/Create.kt
deleted file mode 100644
index 63fe021..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Create.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Create : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Delete.kt b/src/main/kotlin/dev/usbharu/activitystreams/Delete.kt
deleted file mode 100644
index 0e2adcf..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Delete.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Delete : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Dislike.kt b/src/main/kotlin/dev/usbharu/activitystreams/Dislike.kt
deleted file mode 100644
index bc6d905..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Dislike.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Dislike : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Document.kt b/src/main/kotlin/dev/usbharu/activitystreams/Document.kt
deleted file mode 100644
index 5d5d371..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Document.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Document : Object {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Event.kt b/src/main/kotlin/dev/usbharu/activitystreams/Event.kt
deleted file mode 100644
index 46a56fe..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Event.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Event : Object {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Flag.kt b/src/main/kotlin/dev/usbharu/activitystreams/Flag.kt
deleted file mode 100644
index e0ef2dc..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Flag.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Flag : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Follow.kt b/src/main/kotlin/dev/usbharu/activitystreams/Follow.kt
deleted file mode 100644
index 9d5537a..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Follow.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Follow : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Group.kt b/src/main/kotlin/dev/usbharu/activitystreams/Group.kt
deleted file mode 100644
index 29893c1..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Group.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Group : Object{
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Ignore.kt b/src/main/kotlin/dev/usbharu/activitystreams/Ignore.kt
deleted file mode 100644
index 7b8344e..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Ignore.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Ignore : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Image.kt b/src/main/kotlin/dev/usbharu/activitystreams/Image.kt
deleted file mode 100644
index 611c8da..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Image.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Image : Document,ImageOrLink,OrLink{
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Invite.kt b/src/main/kotlin/dev/usbharu/activitystreams/Invite.kt
deleted file mode 100644
index 8699a89..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Invite.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Invite : Offer
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Join.kt b/src/main/kotlin/dev/usbharu/activitystreams/Join.kt
deleted file mode 100644
index 994fbe0..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Join.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Join : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Leave.kt b/src/main/kotlin/dev/usbharu/activitystreams/Leave.kt
deleted file mode 100644
index 9961f6d..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Leave.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Leave : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Like.kt b/src/main/kotlin/dev/usbharu/activitystreams/Like.kt
deleted file mode 100644
index ac45526..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Like.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Like : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Listen.kt b/src/main/kotlin/dev/usbharu/activitystreams/Listen.kt
deleted file mode 100644
index 31a6238..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Listen.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Listen : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Mention.kt b/src/main/kotlin/dev/usbharu/activitystreams/Mention.kt
deleted file mode 100644
index 4482f41..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Mention.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Mention : Link {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/MimeMediaType.kt b/src/main/kotlin/dev/usbharu/activitystreams/MimeMediaType.kt
deleted file mode 100644
index 0d1765b..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/MimeMediaType.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface MimeMediaType {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Move.kt b/src/main/kotlin/dev/usbharu/activitystreams/Move.kt
deleted file mode 100644
index dc0279e..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Move.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Move : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Note.kt b/src/main/kotlin/dev/usbharu/activitystreams/Note.kt
deleted file mode 100644
index ea0195b..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Note.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Note : Object {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/ObjectOrLink.kt b/src/main/kotlin/dev/usbharu/activitystreams/ObjectOrLink.kt
index 5cd1590..97f78ac 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/ObjectOrLink.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/ObjectOrLink.kt
@@ -1,4 +1,4 @@
 package dev.usbharu.activitystreams
 
-sealed interface ObjectOrLink : OrLink {
+interface ObjectOrLink : OrLink {
 }
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Offer.kt b/src/main/kotlin/dev/usbharu/activitystreams/Offer.kt
deleted file mode 100644
index 1bc2356..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Offer.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Offer : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/OrderedCollectionPage.kt b/src/main/kotlin/dev/usbharu/activitystreams/OrderedCollectionPage.kt
deleted file mode 100644
index 25f0162..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/OrderedCollectionPage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface OrderedCollectionPage : OrderedCollection,CollectionPage {
-    var startIndex: UInt?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Organization.kt b/src/main/kotlin/dev/usbharu/activitystreams/Organization.kt
deleted file mode 100644
index b7b0671..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Organization.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Organization : Object {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Page.kt b/src/main/kotlin/dev/usbharu/activitystreams/Page.kt
deleted file mode 100644
index 7fc4da2..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Page.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Page : Document {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Person.kt b/src/main/kotlin/dev/usbharu/activitystreams/Person.kt
deleted file mode 100644
index 125c06a..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Person.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Person : Object {}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Place.kt b/src/main/kotlin/dev/usbharu/activitystreams/Place.kt
deleted file mode 100644
index 6ff68ef..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Place.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Place : Object {
-    var accuracy: Accuracy?
-    var altitude: Float?
-    var latitude: Float?
-    var longitude: Float?
-    var radius: Radius?
-    var units: UriOrUnits?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Profile.kt b/src/main/kotlin/dev/usbharu/activitystreams/Profile.kt
deleted file mode 100644
index 3b393e5..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Profile.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Profile : Object {
-    var describes: Object?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Question.kt b/src/main/kotlin/dev/usbharu/activitystreams/Question.kt
deleted file mode 100644
index 1c8b048..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Question.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Question : IntransitiveActivity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Read.kt b/src/main/kotlin/dev/usbharu/activitystreams/Read.kt
deleted file mode 100644
index 36c4cc5..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Read.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Read : Activity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Reject.kt b/src/main/kotlin/dev/usbharu/activitystreams/Reject.kt
deleted file mode 100644
index f3bd783..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Reject.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Reject : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Relationship.kt b/src/main/kotlin/dev/usbharu/activitystreams/Relationship.kt
deleted file mode 100644
index 3775b6a..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Relationship.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Relationship : Object {
-    var subject: ObjectOrLink?
-    var `object`: ObjectOrLink?
-    var relationship: Object?
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Remove.kt b/src/main/kotlin/dev/usbharu/activitystreams/Remove.kt
deleted file mode 100644
index 270d4c9..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Remove.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Remove : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Service.kt b/src/main/kotlin/dev/usbharu/activitystreams/Service.kt
deleted file mode 100644
index c995e5b..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Service.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Service : Object {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/TentativeAccept.kt b/src/main/kotlin/dev/usbharu/activitystreams/TentativeAccept.kt
deleted file mode 100644
index 345367c..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/TentativeAccept.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface TentativeAccept : Accept
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/TentativeReject.kt b/src/main/kotlin/dev/usbharu/activitystreams/TentativeReject.kt
deleted file mode 100644
index a78f7ba..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/TentativeReject.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface TentativeReject : Reject
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Travel.kt b/src/main/kotlin/dev/usbharu/activitystreams/Travel.kt
deleted file mode 100644
index 3069617..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Travel.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Travel : IntransitiveActivity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Undo.kt b/src/main/kotlin/dev/usbharu/activitystreams/Undo.kt
deleted file mode 100644
index ea63e99..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Undo.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Undo : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Update.kt b/src/main/kotlin/dev/usbharu/activitystreams/Update.kt
deleted file mode 100644
index 2bf78d1..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Update.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Update : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Video.kt b/src/main/kotlin/dev/usbharu/activitystreams/Video.kt
deleted file mode 100644
index 3e783fb..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/Video.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface Video : Document {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/View.kt b/src/main/kotlin/dev/usbharu/activitystreams/View.kt
deleted file mode 100644
index 3f8cf06..0000000
--- a/src/main/kotlin/dev/usbharu/activitystreams/View.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.usbharu.activitystreams
-
-interface View : Activity {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Accept.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Accept.kt
new file mode 100644
index 0000000..77c8898
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Accept.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Accept : Activity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Add.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Add.kt
new file mode 100644
index 0000000..7018773
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Add.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Add : Activity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Announce.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Announce.kt
new file mode 100644
index 0000000..b92d4ce
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Announce.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Announce : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Arrive.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Arrive.kt
new file mode 100644
index 0000000..b88dbd4
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Arrive.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.IntransitiveActivity
+
+interface Arrive : IntransitiveActivity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Block.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Block.kt
new file mode 100644
index 0000000..c6c2d5a
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Block.kt
@@ -0,0 +1,4 @@
+package dev.usbharu.activitystreams.activity
+
+interface Block : Ignore {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Create.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Create.kt
new file mode 100644
index 0000000..0139d78
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Create.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Create : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Delete.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Delete.kt
new file mode 100644
index 0000000..2217987
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Delete.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Delete : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Dislike.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Dislike.kt
new file mode 100644
index 0000000..27ddebb
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Dislike.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Dislike : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Flag.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Flag.kt
new file mode 100644
index 0000000..158aca5
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Flag.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Flag : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Follow.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Follow.kt
new file mode 100644
index 0000000..c147f27
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Follow.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Follow : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Ignore.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Ignore.kt
new file mode 100644
index 0000000..4b10a40
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Ignore.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Ignore : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Invite.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Invite.kt
new file mode 100644
index 0000000..b429d78
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Invite.kt
@@ -0,0 +1,3 @@
+package dev.usbharu.activitystreams.activity
+
+interface Invite : Offer
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Join.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Join.kt
new file mode 100644
index 0000000..147ba4d
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Join.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Join : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Leave.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Leave.kt
new file mode 100644
index 0000000..bbe6d5e
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Leave.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Leave : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Like.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Like.kt
new file mode 100644
index 0000000..299332a
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Like.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Like : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Listen.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Listen.kt
new file mode 100644
index 0000000..f41580b
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Listen.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Listen : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Move.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Move.kt
new file mode 100644
index 0000000..11418db
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Move.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Move : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Offer.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Offer.kt
new file mode 100644
index 0000000..8968a7c
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Offer.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Offer : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Question.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Question.kt
new file mode 100644
index 0000000..b768e56
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Question.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.IntransitiveActivity
+
+interface Question : IntransitiveActivity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Read.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Read.kt
new file mode 100644
index 0000000..b00bf0a
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Read.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Read : Activity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Reject.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Reject.kt
new file mode 100644
index 0000000..21a9f71
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Reject.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Reject : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Remove.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Remove.kt
new file mode 100644
index 0000000..05c9f97
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Remove.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Remove : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/TentativeAccept.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/TentativeAccept.kt
new file mode 100644
index 0000000..f5514d6
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/TentativeAccept.kt
@@ -0,0 +1,3 @@
+package dev.usbharu.activitystreams.activity
+
+interface TentativeAccept : Accept
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/TentativeReject.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/TentativeReject.kt
new file mode 100644
index 0000000..b3d754a
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/TentativeReject.kt
@@ -0,0 +1,3 @@
+package dev.usbharu.activitystreams.activity
+
+interface TentativeReject : Reject
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Travel.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Travel.kt
new file mode 100644
index 0000000..7283232
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Travel.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.IntransitiveActivity
+
+interface Travel : IntransitiveActivity
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Undo.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Undo.kt
new file mode 100644
index 0000000..efdc4d4
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Undo.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Undo : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/Update.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/Update.kt
new file mode 100644
index 0000000..03d0d27
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/Update.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface Update : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/activity/View.kt b/src/main/kotlin/dev/usbharu/activitystreams/activity/View.kt
new file mode 100644
index 0000000..41d9fbc
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/activity/View.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.activity
+
+import dev.usbharu.activitystreams.core.Activity
+
+interface View : Activity {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/actor/Application.kt b/src/main/kotlin/dev/usbharu/activitystreams/actor/Application.kt
new file mode 100644
index 0000000..5f8126a
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/actor/Application.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.actor
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Application : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/actor/Group.kt b/src/main/kotlin/dev/usbharu/activitystreams/actor/Group.kt
new file mode 100644
index 0000000..c200106
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/actor/Group.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.actor
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Group : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/actor/Organization.kt b/src/main/kotlin/dev/usbharu/activitystreams/actor/Organization.kt
new file mode 100644
index 0000000..ad07713
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/actor/Organization.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.actor
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Organization : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/actor/Person.kt b/src/main/kotlin/dev/usbharu/activitystreams/actor/Person.kt
new file mode 100644
index 0000000..41f1851
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/actor/Person.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.actor
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Person : Object {}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/actor/Service.kt b/src/main/kotlin/dev/usbharu/activitystreams/actor/Service.kt
new file mode 100644
index 0000000..bd9d019
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/actor/Service.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.actor
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Service : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Activity.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/Activity.kt
similarity index 55%
rename from src/main/kotlin/dev/usbharu/activitystreams/Activity.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/core/Activity.kt
index d5dd4df..4359298 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Activity.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/Activity.kt
@@ -1,6 +1,8 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.core
 
-sealed interface InternalActivity : Object{
+import dev.usbharu.activitystreams.ObjectOrLink
+
+sealed interface InternalActivity : Object {
     var actor: ObjectOrLink?
     var target: ObjectOrLink?
     var result: ObjectOrLink?
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Collection.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/Collection.kt
similarity index 52%
rename from src/main/kotlin/dev/usbharu/activitystreams/Collection.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/core/Collection.kt
index d05af69..fa3b8c3 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Collection.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/Collection.kt
@@ -1,4 +1,8 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.core
+
+import dev.usbharu.activitystreams.CollectionOrLink
+import dev.usbharu.activitystreams.CollectionPageOrLink
+import dev.usbharu.activitystreams.ObjectOrLink
 
 interface Collection : Object, CollectionOrLink {
     var totalItems: UInt?
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/core/CollectionPage.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/CollectionPage.kt
new file mode 100644
index 0000000..8b26244
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/CollectionPage.kt
@@ -0,0 +1,10 @@
+package dev.usbharu.activitystreams.core
+
+import dev.usbharu.activitystreams.CollectionOrLink
+import dev.usbharu.activitystreams.CollectionPageOrLink
+
+interface CollectionPage : CollectionPageOrLink, Collection {
+    var partOf: CollectionOrLink?
+    var next: CollectionPageOrLink?
+    var prev: CollectionPageOrLink?
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Link.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/Link.kt
similarity index 59%
rename from src/main/kotlin/dev/usbharu/activitystreams/Link.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/core/Link.kt
index 41410a1..443d608 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Link.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/Link.kt
@@ -1,9 +1,12 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.core
 
+import dev.usbharu.activitystreams.*
+import dev.usbharu.activitystreams.other.LangString
+import dev.usbharu.activitystreams.other.MimeMediaType
 import java.net.URI
 import java.util.Locale
 
-interface Link : ObjectOrLink, UriOrLink, CollectionOrLink, ImageOrLink,CollectionPageOrLink {
+interface Link : ObjectOrLink, UriOrLink, CollectionOrLink, ImageOrLink, CollectionPageOrLink {
     var href: URI?
     var rel: Set<String>
     var mediaType: MimeMediaType?
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Object.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/Object.kt
similarity index 82%
rename from src/main/kotlin/dev/usbharu/activitystreams/Object.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/core/Object.kt
index ed6b6f3..6b4ff5f 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Object.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/Object.kt
@@ -1,5 +1,8 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.core
 
+import dev.usbharu.activitystreams.*
+import dev.usbharu.activitystreams.other.LangString
+import dev.usbharu.activitystreams.other.MimeMediaType
 import java.time.Duration
 import java.time.OffsetDateTime
 
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/OrderedCollection.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/OrderedCollection.kt
similarity index 51%
rename from src/main/kotlin/dev/usbharu/activitystreams/OrderedCollection.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/core/OrderedCollection.kt
index c7747ae..bbfac1d 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/OrderedCollection.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/OrderedCollection.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.core
 
 interface OrderedCollection : Collection {
 }
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/core/OrderedCollectionPage.kt b/src/main/kotlin/dev/usbharu/activitystreams/core/OrderedCollectionPage.kt
new file mode 100644
index 0000000..20f7f80
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/core/OrderedCollectionPage.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.core
+
+interface OrderedCollectionPage : OrderedCollection, CollectionPage {
+    var startIndex: UInt?
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/link/Mention.kt b/src/main/kotlin/dev/usbharu/activitystreams/link/Mention.kt
new file mode 100644
index 0000000..2206904
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/link/Mention.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.link
+
+import dev.usbharu.activitystreams.core.Link
+
+interface Mention : Link {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Article.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Article.kt
new file mode 100644
index 0000000..62c2412
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Article.kt
@@ -0,0 +1,5 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Article : Object
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Audio.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Audio.kt
new file mode 100644
index 0000000..c4573d9
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Audio.kt
@@ -0,0 +1,4 @@
+package dev.usbharu.activitystreams.`object`
+
+interface Audio : Document {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Document.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Document.kt
new file mode 100644
index 0000000..c12de26
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Document.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Document : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Event.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Event.kt
new file mode 100644
index 0000000..8391a01
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Event.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Event : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Image.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Image.kt
new file mode 100644
index 0000000..33ce532
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Image.kt
@@ -0,0 +1,7 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.ImageOrLink
+import dev.usbharu.activitystreams.OrLink
+
+interface Image : Document, ImageOrLink, OrLink {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Note.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Note.kt
new file mode 100644
index 0000000..947ca6b
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Note.kt
@@ -0,0 +1,6 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Note : Object {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Page.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Page.kt
new file mode 100644
index 0000000..322455b
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Page.kt
@@ -0,0 +1,4 @@
+package dev.usbharu.activitystreams.`object`
+
+interface Page : Document {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Place.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Place.kt
new file mode 100644
index 0000000..4596dcd
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Place.kt
@@ -0,0 +1,15 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.other.Accuracy
+import dev.usbharu.activitystreams.other.Radius
+import dev.usbharu.activitystreams.UriOrUnits
+import dev.usbharu.activitystreams.core.Object
+
+interface Place : Object {
+    var accuracy: Accuracy?
+    var altitude: Float?
+    var latitude: Float?
+    var longitude: Float?
+    var radius: Radius?
+    var units: UriOrUnits?
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Profile.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Profile.kt
new file mode 100644
index 0000000..dc2e959
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Profile.kt
@@ -0,0 +1,7 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.core.Object
+
+interface Profile : Object {
+    var describes: Object?
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Relationship.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Relationship.kt
new file mode 100644
index 0000000..164d39c
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Relationship.kt
@@ -0,0 +1,10 @@
+package dev.usbharu.activitystreams.`object`
+
+import dev.usbharu.activitystreams.ObjectOrLink
+import dev.usbharu.activitystreams.core.Object
+
+interface Relationship : Object {
+    var subject: ObjectOrLink?
+    var `object`: ObjectOrLink?
+    var relationship: Object?
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Tombstone.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Tombstone.kt
similarity index 57%
rename from src/main/kotlin/dev/usbharu/activitystreams/Tombstone.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/object/Tombstone.kt
index 3f84623..9b7b8af 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Tombstone.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Tombstone.kt
@@ -1,5 +1,6 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.`object`
 
+import dev.usbharu.activitystreams.core.Object
 import java.time.OffsetDateTime
 
 interface Tombstone : Object {
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/object/Video.kt b/src/main/kotlin/dev/usbharu/activitystreams/object/Video.kt
new file mode 100644
index 0000000..f80746f
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/object/Video.kt
@@ -0,0 +1,4 @@
+package dev.usbharu.activitystreams.`object`
+
+interface Video : Document {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Accuracy.kt b/src/main/kotlin/dev/usbharu/activitystreams/other/Accuracy.kt
similarity index 75%
rename from src/main/kotlin/dev/usbharu/activitystreams/Accuracy.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/other/Accuracy.kt
index 64aa3e4..5bcfcc1 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Accuracy.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/other/Accuracy.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.other
 
 @JvmInline
 value class Accuracy(val value: Float) {
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/LangString.kt b/src/main/kotlin/dev/usbharu/activitystreams/other/LangString.kt
similarity index 78%
rename from src/main/kotlin/dev/usbharu/activitystreams/LangString.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/other/LangString.kt
index 38b977a..7f5c363 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/LangString.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/other/LangString.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.other
 
 import java.util.Locale
 
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/other/MimeMediaType.kt b/src/main/kotlin/dev/usbharu/activitystreams/other/MimeMediaType.kt
new file mode 100644
index 0000000..da30749
--- /dev/null
+++ b/src/main/kotlin/dev/usbharu/activitystreams/other/MimeMediaType.kt
@@ -0,0 +1,4 @@
+package dev.usbharu.activitystreams.other
+
+interface MimeMediaType {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Radius.kt b/src/main/kotlin/dev/usbharu/activitystreams/other/Radius.kt
similarity index 70%
rename from src/main/kotlin/dev/usbharu/activitystreams/Radius.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/other/Radius.kt
index 89bf036..de78bc6 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Radius.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/other/Radius.kt
@@ -1,4 +1,4 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.other
 
 @JvmInline
 value class Radius(val value: Int) {
diff --git a/src/main/kotlin/dev/usbharu/activitystreams/Units.kt b/src/main/kotlin/dev/usbharu/activitystreams/other/Units.kt
similarity index 62%
rename from src/main/kotlin/dev/usbharu/activitystreams/Units.kt
rename to src/main/kotlin/dev/usbharu/activitystreams/other/Units.kt
index 0e331bb..01ba6f9 100644
--- a/src/main/kotlin/dev/usbharu/activitystreams/Units.kt
+++ b/src/main/kotlin/dev/usbharu/activitystreams/other/Units.kt
@@ -1,4 +1,6 @@
-package dev.usbharu.activitystreams
+package dev.usbharu.activitystreams.other
+
+import dev.usbharu.activitystreams.UriOrUnits
 
 enum class Units(val value: String) : UriOrUnits {
     cm("cm"),