diff --git a/content/documentation/content/concerns/_index.md b/content/documentation/content/concerns/_index.md
index b61fbb0..f06cca3 100644
--- a/content/documentation/content/concerns/_index.md
+++ b/content/documentation/content/concerns/_index.md
@@ -14,7 +14,7 @@ a custom HTTP header to every response generated by the server:
 using GenHTTP.Api.Content;
 using GenHTTP.Api.Protocol;
 
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.IO;
 using GenHTTP.Modules.Layouting;
diff --git a/content/documentation/content/concerns/inspection.md b/content/documentation/content/concerns/inspection.md
index 4d807d1..80a308a 100644
--- a/content/documentation/content/concerns/inspection.md
+++ b/content/documentation/content/concerns/inspection.md
@@ -15,7 +15,7 @@ request and will respond with a detailed summary of how the received request loo
 was generated by the server.
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.Inspection;
 using GenHTTP.Modules.Layouting;
@@ -48,7 +48,7 @@ instead:
 ```csharp
 using GenHTTP.Api.Protocol;
 
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.Conversion;
 using GenHTTP.Modules.Conversion.Serializers.Json;
diff --git a/content/documentation/content/concerns/open-api.md b/content/documentation/content/concerns/open-api.md
index e54b678..cb3a9cd 100644
--- a/content/documentation/content/concerns/open-api.md
+++ b/content/documentation/content/concerns/open-api.md
@@ -13,7 +13,7 @@ This concern dynamically generates and serves an [Open API v3 specification](htt
 [NSwag](https://github.com/RicoSuter/NSwag) for all detected API endpoints.
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.Functional;
 using GenHTTP.Modules.OpenApi;
@@ -59,7 +59,7 @@ To customize the generated specification you can pass a function that will be ex
 just before the document is serialized and sent to the requesting client.
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.Functional;
 using GenHTTP.Modules.OpenApi;
@@ -108,7 +108,7 @@ will describe the operation.
 
 ```csharp
 using GenHTTP.Api.Content;
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 using GenHTTP.Modules.Basics;
 using GenHTTP.Modules.Basics.Providers;
 using GenHTTP.Modules.Layouting;
diff --git a/content/documentation/content/frameworks/functional.md b/content/documentation/content/frameworks/functional.md
index d78c794..2803b00 100644
--- a/content/documentation/content/frameworks/functional.md
+++ b/content/documentation/content/frameworks/functional.md
@@ -23,7 +23,7 @@ To host an API using this framework you can create an `Inline` handler and add
 your operations as needed. 
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.Functional;
 using GenHTTP.Modules.Layouting;
diff --git a/content/documentation/content/frameworks/webservices.md b/content/documentation/content/frameworks/webservices.md
index 3094475..5c02174 100644
--- a/content/documentation/content/frameworks/webservices.md
+++ b/content/documentation/content/frameworks/webservices.md
@@ -27,7 +27,7 @@ The following example shows how to define and host a service that can be used
 to manage an entity (books in this case).
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Api.Protocol;
 
diff --git a/content/documentation/content/frameworks/websockets.md b/content/documentation/content/frameworks/websockets.md
index 9b519bb..d525fda 100644
--- a/content/documentation/content/frameworks/websockets.md
+++ b/content/documentation/content/frameworks/websockets.md
@@ -17,7 +17,7 @@ The following example hosts a simple console application that provides a websock
 to connected clients:
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 using GenHTTP.Modules.Practices;
 using GenHTTP.Modules.Websockets;
 
@@ -46,7 +46,7 @@ var host = Host.Create()
     .Development()
     .Console();
 
-host.Start();
+await host.StartAsync();
 
 var input = Console.ReadLine();
 
@@ -63,7 +63,7 @@ while (input != "exit")
     input = Console.ReadLine();
 }
 
-host.Stop();
+await host.StopAsync();
 ```
 
 After starting the server, you can open the following HTML page (provided by the Fleck project as a sample)
diff --git a/content/documentation/content/handlers/_index.md b/content/documentation/content/handlers/_index.md
index f784470..6bc1cf1 100644
--- a/content/documentation/content/handlers/_index.md
+++ b/content/documentation/content/handlers/_index.md
@@ -17,7 +17,7 @@ a custom handler instance. The following example will generate a simple text res
 using GenHTTP.Api.Content;
 using GenHTTP.Api.Protocol;
 
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.IO;
 
diff --git a/content/documentation/content/handlers/server-sent-events.md b/content/documentation/content/handlers/server-sent-events.md
index c2dab40..bca40e0 100644
--- a/content/documentation/content/handlers/server-sent-events.md
+++ b/content/documentation/content/handlers/server-sent-events.md
@@ -19,7 +19,7 @@ The following example will host a SSE endpoint that will stream
 randomly generated updates on stock prices to a client until it disconnects.
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.IO;
 using GenHTTP.Modules.Layouting;
diff --git a/content/documentation/tutorials/two-line-webservice.md b/content/documentation/tutorials/two-line-webservice.md
index 5fc172c..c59b04c 100644
--- a/content/documentation/tutorials/two-line-webservice.md
+++ b/content/documentation/tutorials/two-line-webservice.md
@@ -45,7 +45,7 @@ entries to your project file.
 In the same directory, create a file named `Program.cs` and add the following content.
 
 ```csharp
-using GenHTTP.Engine;
+using GenHTTP.Engine.Internal;
 
 using GenHTTP.Modules.Functional;
 using GenHTTP.Modules.Practices;