diff --git a/beehttp/context.go b/context/context.go
similarity index 97%
rename from beehttp/context.go
rename to context/context.go
index bae7506c..f985e4e2 100644
--- a/beehttp/context.go
+++ b/context/context.go
@@ -1,4 +1,4 @@
-package beehttp
+package context
 
 import (
 	"net/http"
diff --git a/beehttp/input.go b/context/input.go
similarity index 99%
rename from beehttp/input.go
rename to context/input.go
index f6dd2d3f..7ebe3944 100644
--- a/beehttp/input.go
+++ b/context/input.go
@@ -1,4 +1,4 @@
-package beehttp
+package context
 
 import (
 	"bytes"
diff --git a/beehttp/output.go b/context/output.go
similarity index 99%
rename from beehttp/output.go
rename to context/output.go
index 10be04d4..91fc63ae 100644
--- a/beehttp/output.go
+++ b/context/output.go
@@ -1,4 +1,4 @@
-package beehttp
+package context
 
 import (
 	"bytes"
diff --git a/middleware/router.go b/middleware/router.go
new file mode 100644
index 00000000..e69de29b