diff --git a/lib/finapps.rb b/lib/finapps.rb
index d83ad374..731071bf 100644
--- a/lib/finapps.rb
+++ b/lib/finapps.rb
@@ -12,10 +12,10 @@
 require 'finapps/utils/loggeable'
 require 'finapps/error'
 
-require 'finapps/middleware/tenant_authentication'
-require 'finapps/middleware/accept_json'
-require 'finapps/middleware/user_agent'
-require 'finapps/middleware/raise_error'
+require 'finapps/middleware/request/tenant_authentication'
+require 'finapps/middleware/request/accept_json'
+require 'finapps/middleware/request/user_agent'
+require 'finapps/middleware/response/raise_error'
 require 'finapps/middleware/middleware'
 
 require 'finapps/rest/defaults'
diff --git a/lib/finapps/middleware/middleware.rb b/lib/finapps/middleware/middleware.rb
index 09ccc39e..50bf2960 100644
--- a/lib/finapps/middleware/middleware.rb
+++ b/lib/finapps/middleware/middleware.rb
@@ -3,9 +3,9 @@
 
 module FinApps
   module Middleware
-    autoload :AcceptJson, 'finapps/middleware/accept_json'
-    autoload :UserAgent, 'finapps/middleware/user_agent'
-    autoload :TenantAuthentication, 'finapps/middleware/tenant_authentication'
+    autoload :AcceptJson, 'finapps/middleware/request/accept_json'
+    autoload :UserAgent, 'finapps/middleware/request/user_agent'
+    autoload :TenantAuthentication, 'finapps/middleware/request/tenant_authentication'
 
     if Faraday::Middleware.respond_to? :register_middleware
       Faraday::Request.register_middleware \
diff --git a/lib/finapps/middleware/accept_json.rb b/lib/finapps/middleware/request/accept_json.rb
similarity index 100%
rename from lib/finapps/middleware/accept_json.rb
rename to lib/finapps/middleware/request/accept_json.rb
diff --git a/lib/finapps/middleware/tenant_authentication.rb b/lib/finapps/middleware/request/tenant_authentication.rb
similarity index 100%
rename from lib/finapps/middleware/tenant_authentication.rb
rename to lib/finapps/middleware/request/tenant_authentication.rb
diff --git a/lib/finapps/middleware/user_agent.rb b/lib/finapps/middleware/request/user_agent.rb
similarity index 100%
rename from lib/finapps/middleware/user_agent.rb
rename to lib/finapps/middleware/request/user_agent.rb
diff --git a/lib/finapps/middleware/raise_error.rb b/lib/finapps/middleware/response/raise_error.rb
similarity index 100%
rename from lib/finapps/middleware/raise_error.rb
rename to lib/finapps/middleware/response/raise_error.rb