diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
index 08c3579e..49c0d197 100644
--- a/servant-server/servant-server.cabal
+++ b/servant-server/servant-server.cabal
@@ -45,7 +45,7 @@ library
   exposed-modules:
     Servant
     Servant.Server
-    Servant.Server.CombinatorUtils
+    Servant.Server.Utils.CustomCombinators
     Servant.Server.Experimental.Auth
     Servant.Server.Internal
     Servant.Server.Internal.BasicAuth
@@ -133,7 +133,7 @@ test-suite spec
   main-is: Spec.hs
   other-modules:
       Servant.ArbitraryMonadServerSpec
-      Servant.Server.CombinatorUtilsSpec
+      Servant.Server.Utils.CustomCombinatorsSpec
       Servant.Server.ErrorSpec
       Servant.Server.Internal.ContextSpec
       Servant.Server.Internal.RoutingApplicationSpec
diff --git a/servant-server/src/Servant/Server/CombinatorUtils.hs b/servant-server/src/Servant/Server/Utils/CustomCombinators.hs
similarity index 98%
rename from servant-server/src/Servant/Server/CombinatorUtils.hs
rename to servant-server/src/Servant/Server/Utils/CustomCombinators.hs
index c1ca2f69..e0e133e6 100644
--- a/servant-server/src/Servant/Server/CombinatorUtils.hs
+++ b/servant-server/src/Servant/Server/Utils/CustomCombinators.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
 
-module Servant.Server.CombinatorUtils (
+module Servant.Server.Utils.CustomCombinators (
   CombinatorImplementation,
   runCI,
   makeCaptureCombinator,
diff --git a/servant-server/test/Servant/Server/CombinatorUtilsSpec.hs b/servant-server/test/Servant/Server/Utils/CustomCombinatorsSpec.hs
similarity index 98%
rename from servant-server/test/Servant/Server/CombinatorUtilsSpec.hs
rename to servant-server/test/Servant/Server/Utils/CustomCombinatorsSpec.hs
index f8a0c4bd..31839cd8 100644
--- a/servant-server/test/Servant/Server/CombinatorUtilsSpec.hs
+++ b/servant-server/test/Servant/Server/Utils/CustomCombinatorsSpec.hs
@@ -8,7 +8,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-module Servant.Server.CombinatorUtilsSpec where
+module Servant.Server.Utils.CustomCombinatorsSpec where
 
 import           Control.Concurrent
 import           Data.ByteString.Builder
@@ -27,7 +27,7 @@ import           Test.Hspec
 
 import           Servant.API
 import           Servant.Server
-import           Servant.Server.CombinatorUtils
+import           Servant.Server.Utils.CustomCombinators
 
 runApp :: Application -> Request -> IO Response
 runApp app req = do