diff --git a/src/kemal.cr b/src/kemal.cr
index fc43022..f3e17c1 100644
--- a/src/kemal.cr
+++ b/src/kemal.cr
@@ -3,6 +3,7 @@ require "json"
 require "uri"
 require "tempfile"
 require "./kemal/*"
+require "./kemal/ext/*"
 require "./kemal/helpers/*"
 
 # This is literally `hack` to fix [Crystal issue #4060](https://github.com/crystal-lang/crystal/issues/4060)
diff --git a/src/kemal/context.cr b/src/kemal/ext/context.cr
similarity index 100%
rename from src/kemal/context.cr
rename to src/kemal/ext/context.cr
diff --git a/src/kemal/request.cr b/src/kemal/ext/request.cr
similarity index 100%
rename from src/kemal/request.cr
rename to src/kemal/ext/request.cr