diff --git a/README.md b/README.md
index 766a62e..aabd3c2 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Create a simple ActivityPub actor and serve it:
 
 ```python
 from apkit.models import Person
-from apkit.server import ActivityPubServer
+from apkit.server.app import ActivityPubServer
 from apkit.server.responses import ActivityResponse
 
 app = ActivityPubServer()
diff --git a/docs/index.md b/docs/index.md
index 7b9072d..043c0d6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -64,7 +64,7 @@ Create a simple ActivityPub actor and serve it:
 
 ```python
 from apkit.models import Person
-from apkit.server import ActivityPubServer
+from apkit.server.app import ActivityPubServer
 from apkit.server.responses import ActivityResponse
 
 app = ActivityPubServer()
diff --git a/docs/tutorial.md b/docs/tutorial.md
index f927ad4..31f2115 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -28,7 +28,8 @@ from fastapi.responses import JSONResponse
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization as crypto_serialization
 
-from apkit.server import ActivityPubServer, SubRouter
+from apkit.server.app import ActivityPubServer
+from apkit.server.subrouter import SubRouter
 from apkit.server.types import Context, ActorKey
 from apkit.server.responses import ActivityResponse
 from apkit.models import (
@@ -211,7 +212,8 @@ from fastapi.responses import JSONResponse
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization as crypto_serialization
 
-from apkit.server import ActivityPubServer, SubRouter
+from apkit.server.app import ActivityPubServer
+from apkit.server.subrouter import SubRouter
 from apkit.server.types import Context, ActorKey
 from apkit.server.responses import ActivityResponse
 from apkit.models import (
diff --git a/examples/minimal_server.py b/examples/minimal_server.py
index 396ebea..db56146 100644
--- a/examples/minimal_server.py
+++ b/examples/minimal_server.py
@@ -25,7 +25,7 @@
     OrderedCollectionPage,
     Person,
 )
-from apkit.server import ActivityPubServer
+from apkit.server.app import ActivityPubServer
 from apkit.server.responses import ActivityResponse
 from apkit.server.types import ActorKey, Context, Outbox