diff --git a/clean.sh b/clean.sh
index aebdf64..2ba828d 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-rm src.a
+[[ -f src.a ]] && rm src.a
 find ./ -type f | grep -E '\.o$' | xargs -I'{}' rm '{}'
diff --git a/src/ap/activity.h b/src/ap/activity.h
deleted file mode 100644
index ec552f2..0000000
--- a/src/ap/activity.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "object.h"
-
diff --git a/src/ap/activity.c b/src/ap/object.c
similarity index 95%
rename from src/ap/activity.c
rename to src/ap/object.c
index 34e5e64..ce329ee 100644
--- a/src/ap/activity.c
+++ b/src/ap/object.c
@@ -1,19 +1,13 @@
 #define _GNU_SOURCE
-#include "activity.h"
-#include "activity/context.h"
+#include "object.h"
+#include "object/context.h"
+#include "object/rsa_signature_2017.h"
 
+// Submodules
 #include "ffdb/fs_list.h"
 #include "collections/array.h"
 #include "format.h"
 
-#include "model/server.h"
-#include "model/account.h"
-#include "model/status.h"
-#include "model/emoji.h"
-#include "model/media.h"
-//#include "model/ap/outbox_envelope.h"
-#include "activity/rsa_signature_2017.h"
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/ap/object.h b/src/ap/object.h
index eac8821..357a2ab 100644
--- a/src/ap/object.h
+++ b/src/ap/object.h
@@ -2,8 +2,8 @@
 
 #include "json/layout.h"
 
-#include "activity/context.h"
-#include "activity/tag.h"
+#include "object/context.h"
+#include "object/tag.h"
 
 #include <time.h>
 
diff --git a/src/ap/activity/attachement.c b/src/ap/object/attachement.c
similarity index 96%
rename from src/ap/activity/attachement.c
rename to src/ap/object/attachement.c
index ae1a7ab..ccd07da 100644
--- a/src/ap/activity/attachement.c
+++ b/src/ap/object/attachement.c
@@ -1,4 +1,4 @@
-#include "../activity.h"
+#include "../object.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/ap/activity/attachement.h b/src/ap/object/attachement.h
similarity index 100%
rename from src/ap/activity/attachement.h
rename to src/ap/object/attachement.h
diff --git a/src/ap/activity/context.c b/src/ap/object/context.c
similarity index 100%
rename from src/ap/activity/context.c
rename to src/ap/object/context.c
diff --git a/src/ap/activity/context.h b/src/ap/object/context.h
similarity index 100%
rename from src/ap/activity/context.h
rename to src/ap/object/context.h
diff --git a/src/ap/activity/layout.c b/src/ap/object/layout.c
similarity index 99%
rename from src/ap/activity/layout.c
rename to src/ap/object/layout.c
index 0cd979c..c223eec 100644
--- a/src/ap/activity/layout.c
+++ b/src/ap/object/layout.c
@@ -1,4 +1,4 @@
-#include "../activity.h"
+#include "../object.h"
 
 #include "json/layout.h"
 
diff --git a/src/ap/activity/layout/capabilities.c b/src/ap/object/layout/capabilities.c
similarity index 97%
rename from src/ap/activity/layout/capabilities.c
rename to src/ap/object/layout/capabilities.c
index 7540027..076ceac 100644
--- a/src/ap/activity/layout/capabilities.c
+++ b/src/ap/object/layout/capabilities.c
@@ -1,4 +1,4 @@
-#include "../../activity.h"
+#include "../../object.h"
 
 #define OBJ_TYPE struct ap_object
 static struct json_object_field capabilities_layout[] = {
diff --git a/src/ap/activity/layout/content.c b/src/ap/object/layout/content.c
similarity index 98%
rename from src/ap/activity/layout/content.c
rename to src/ap/object/layout/content.c
index 2a22e8c..5763562 100644
--- a/src/ap/activity/layout/content.c
+++ b/src/ap/object/layout/content.c
@@ -1,4 +1,4 @@
-#include "../../activity.h"
+#include "../../object.h"
 
 #include "json/json.h"
 
diff --git a/src/ap/activity/layout/endpoints.c b/src/ap/object/layout/endpoints.c
similarity index 96%
rename from src/ap/activity/layout/endpoints.c
rename to src/ap/object/layout/endpoints.c
index f3af4c0..84a0301 100644
--- a/src/ap/activity/layout/endpoints.c
+++ b/src/ap/object/layout/endpoints.c
@@ -1,4 +1,4 @@
-#include "../../activity.h"
+#include "../../object.h"
 
 #define OBJ_TYPE struct ap_object
 static struct json_object_field endpoints_layout[] = {
diff --git a/src/ap/activity/layout/icon.c b/src/ap/object/layout/icon.c
similarity index 96%
rename from src/ap/activity/layout/icon.c
rename to src/ap/object/layout/icon.c
index 5f37493..8b60e73 100644
--- a/src/ap/activity/layout/icon.c
+++ b/src/ap/object/layout/icon.c
@@ -1,4 +1,4 @@
-#include "../../activity.h"
+#include "../../object.h"
 
 #define OBJ_TYPE struct ap_object
 static struct json_object_field image_layout[] = {
diff --git a/src/ap/activity/layout/signature.c b/src/ap/object/layout/signature.c
similarity index 94%
rename from src/ap/activity/layout/signature.c
rename to src/ap/object/layout/signature.c
index 600d30f..e5e0ca6 100644
--- a/src/ap/activity/layout/signature.c
+++ b/src/ap/object/layout/signature.c
@@ -1,4 +1,4 @@
-#include "../../activity.h"
+#include "../../object.h"
 
 static struct json_enum ap_signature_type_enum[] = {
 	{ "RsaSignature2017", 1 },
diff --git a/src/ap/activity/ptr_or_ref.c b/src/ap/object/ptr_or_ref.c
similarity index 98%
rename from src/ap/activity/ptr_or_ref.c
rename to src/ap/object/ptr_or_ref.c
index a6b4c39..3904740 100644
--- a/src/ap/activity/ptr_or_ref.c
+++ b/src/ap/object/ptr_or_ref.c
@@ -2,7 +2,7 @@
 #include "json/json.h"
 #include "json/layout.h"
 
-#include "../activity.h"
+#include "../object.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/ap/activity/rsa_signature_2017.c b/src/ap/object/rsa_signature_2017.c
similarity index 99%
rename from src/ap/activity/rsa_signature_2017.c
rename to src/ap/object/rsa_signature_2017.c
index 84179ed..878e447 100644
--- a/src/ap/activity/rsa_signature_2017.c
+++ b/src/ap/object/rsa_signature_2017.c
@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 #include "rsa_signature_2017.h"
 
-#include "../activity.h"
+#include "../object.h"
 
 // TODO: figure out how to remove this dependency
 #include "model/crypto/keys.h"
diff --git a/src/ap/activity/rsa_signature_2017.h b/src/ap/object/rsa_signature_2017.h
similarity index 100%
rename from src/ap/activity/rsa_signature_2017.h
rename to src/ap/object/rsa_signature_2017.h
diff --git a/src/ap/activity/tag.c b/src/ap/object/tag.c
similarity index 100%
rename from src/ap/activity/tag.c
rename to src/ap/object/tag.c
diff --git a/src/ap/activity/tag.h b/src/ap/object/tag.h
similarity index 100%
rename from src/ap/activity/tag.h
rename to src/ap/object/tag.h
diff --git a/src/controller/inbox/announce.c b/src/controller/inbox/announce.c
index e1a139e..a569f51 100644
--- a/src/controller/inbox/announce.c
+++ b/src/controller/inbox/announce.c
@@ -1,7 +1,7 @@
 #include "../inbox.h"
 
 // Submodules
-#include "ap/activity.h"
+#include "ap/object.h"
 
 // Model
 #include "model/account.h"
diff --git a/src/controller/outbox.c b/src/controller/outbox.c
index 7c8d881..30a3ef9 100644
--- a/src/controller/outbox.c
+++ b/src/controller/outbox.c
@@ -5,7 +5,7 @@
 #include "collections/array.h"
 #include "http/client/client.h"
 #include "ap/object.h"
-#include "ap/activity/rsa_signature_2017.h"
+#include "ap/object/rsa_signature_2017.h"
 
 // Model
 #include "model/server.h"
diff --git a/src/controller/owner.c b/src/controller/owner.c
index c7ac3ed..cbcb55e 100644
--- a/src/controller/owner.c
+++ b/src/controller/owner.c
@@ -2,7 +2,7 @@
 
 // Submodules
 #include "http/server/request.h"
-#include "ap/activity.h"
+#include "ap/object.h"
 
 // Model
 #include "model/server.h"
diff --git a/src/dev.c b/src/dev.c
index 7c928ba..ef509a7 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -2,8 +2,8 @@
 
 #include "ffdb/fs_list.h"
 #include "ffdb/trie.h"
-#include "ap/activity/rsa_signature_2017.h"
 #include "ap/object.h"
+#include "ap/object/rsa_signature_2017.h"
 #include "collections/array.h"
 
 #include "model/account.h"
diff --git a/src/model/account.c b/src/model/account.c
index f9e5c9c..da93912 100644
--- a/src/model/account.c
+++ b/src/model/account.c
@@ -9,7 +9,7 @@
 #include "ffdb/trie.h"
 #include "format.h"
 #include "collections/array.h"
-#include "ap/activity.h"
+#include "ap/object.h"
 
 // Model
 #include "model/server.h"
diff --git a/src/model/account/ap_sync.c b/src/model/account/ap_sync.c
index 9a2c58e..4056999 100644
--- a/src/model/account/ap_sync.c
+++ b/src/model/account/ap_sync.c
@@ -3,7 +3,7 @@
 // Submodules
 #include "collections/array.h"
 #include "format.h"
-#include "ap/activity.h"
+#include "ap/object.h"
 
 // Standard Library
 #include <string.h>