diff --git a/inc/init.php b/includes/init.php
similarity index 79%
rename from inc/init.php
rename to includes/init.php
index 70e1e81..089f7d7 100644
--- a/inc/init.php
+++ b/includes/init.php
@@ -1,8 +1,8 @@
 <?php
 namespace init;
 
-require_once plugin_dir_path( __FILE__ ) . '/api.php';
-require_once plugin_dir_path( __FILE__ ) . '/actors.php';
+require_once plugin_dir_path( __FILE__ ) . '/server/api.php';
+require_once plugin_dir_path( __FILE__ ) . '/server/actors.php';
 require_once plugin_dir_path( __FILE__ ) . '/migrations.php';
 
 add_action( 'rest_api_init', function() {
diff --git a/inc/migrations.php b/includes/migrations.php
similarity index 100%
rename from inc/migrations.php
rename to includes/migrations.php
diff --git a/inc/activities.php b/includes/server/activities.php
similarity index 100%
rename from inc/activities.php
rename to includes/server/activities.php
diff --git a/inc/activities/accept.php b/includes/server/activities/accept.php
similarity index 100%
rename from inc/activities/accept.php
rename to includes/server/activities/accept.php
diff --git a/inc/activities/announce.php b/includes/server/activities/announce.php
similarity index 100%
rename from inc/activities/announce.php
rename to includes/server/activities/announce.php
diff --git a/inc/activities/block.php b/includes/server/activities/block.php
similarity index 100%
rename from inc/activities/block.php
rename to includes/server/activities/block.php
diff --git a/inc/activities/create.php b/includes/server/activities/create.php
similarity index 100%
rename from inc/activities/create.php
rename to includes/server/activities/create.php
diff --git a/inc/activities/delete.php b/includes/server/activities/delete.php
similarity index 100%
rename from inc/activities/delete.php
rename to includes/server/activities/delete.php
diff --git a/inc/activities/follow.php b/includes/server/activities/follow.php
similarity index 100%
rename from inc/activities/follow.php
rename to includes/server/activities/follow.php
diff --git a/inc/activities/like.php b/includes/server/activities/like.php
similarity index 100%
rename from inc/activities/like.php
rename to includes/server/activities/like.php
diff --git a/inc/activities/reject.php b/includes/server/activities/reject.php
similarity index 100%
rename from inc/activities/reject.php
rename to includes/server/activities/reject.php
diff --git a/inc/activities/undo.php b/includes/server/activities/undo.php
similarity index 99%
rename from inc/activities/undo.php
rename to includes/server/activities/undo.php
index bc45775..b9b9a71 100644
--- a/inc/activities/undo.php
+++ b/includes/server/activities/undo.php
@@ -1,7 +1,7 @@
 <?php
 namespace activities\undo;
 
-require_once plugin_dir_path( __FILE__ ) . '/../util.php';
+require_once plugin_dir_path( __FILE__ ) . '/../../util.php';
 require_once plugin_dir_path( __FILE__ ) . '/../activities.php';
 require_once plugin_dir_path( __FILE__ ) . '/../actors.php';
 require_once plugin_dir_path( __FILE__ ) . '/../objects.php';
diff --git a/inc/activities/update.php b/includes/server/activities/update.php
similarity index 100%
rename from inc/activities/update.php
rename to includes/server/activities/update.php
diff --git a/inc/actors.php b/includes/server/actors.php
similarity index 100%
rename from inc/actors.php
rename to includes/server/actors.php
diff --git a/inc/api.php b/includes/server/api.php
similarity index 100%
rename from inc/api.php
rename to includes/server/api.php
diff --git a/inc/blocks.php b/includes/server/blocks.php
similarity index 100%
rename from inc/blocks.php
rename to includes/server/blocks.php
diff --git a/inc/collections.php b/includes/server/collections.php
similarity index 100%
rename from inc/collections.php
rename to includes/server/collections.php
diff --git a/inc/deliver.php b/includes/server/deliver.php
similarity index 100%
rename from inc/deliver.php
rename to includes/server/deliver.php
diff --git a/inc/followers.php b/includes/server/followers.php
similarity index 100%
rename from inc/followers.php
rename to includes/server/followers.php
diff --git a/inc/following.php b/includes/server/following.php
similarity index 100%
rename from inc/following.php
rename to includes/server/following.php
diff --git a/inc/inbox.php b/includes/server/inbox.php
similarity index 100%
rename from inc/inbox.php
rename to includes/server/inbox.php
diff --git a/inc/likes.php b/includes/server/likes.php
similarity index 100%
rename from inc/likes.php
rename to includes/server/likes.php
diff --git a/inc/objects.php b/includes/server/objects.php
similarity index 100%
rename from inc/objects.php
rename to includes/server/objects.php
diff --git a/inc/outbox.php b/includes/server/outbox.php
similarity index 100%
rename from inc/outbox.php
rename to includes/server/outbox.php
diff --git a/inc/shares.php b/includes/server/shares.php
similarity index 100%
rename from inc/shares.php
rename to includes/server/shares.php
diff --git a/inc/util.php b/includes/util.php
similarity index 100%
rename from inc/util.php
rename to includes/util.php
diff --git a/pterotype.php b/pterotype.php
index 5db8d84..86a8f08 100644
--- a/pterotype.php
+++ b/pterotype.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: Pterotype
 */
-require_once plugin_dir_path( __FILE__ ) . 'inc/init.php';
+require_once plugin_dir_path( __FILE__ ) . 'includes/init.php';
 
 define( 'PTEROTYPE_VERSION', '0.0.4' );