diff --git a/src/Handler/Zip.hs b/src/Handler/Utils/Zip.hs
similarity index 99%
rename from src/Handler/Zip.hs
rename to src/Handler/Utils/Zip.hs
index 7d589e87b..4afcb8386 100644
--- a/src/Handler/Zip.hs
+++ b/src/Handler/Utils/Zip.hs
@@ -4,7 +4,7 @@
 {-# OPTIONS_GHC -fno-warn-missing-fields #-} -- This concerns zipEntrySize in produceZip
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Handler.Zip
+module Handler.Utils.Zip
   ( ZipError(..)
   , ZipInfo(..)
   , produceZip
diff --git a/test/Handler/ZipSpec.hs b/test/Handler/Utils/ZipSpec.hs
similarity index 96%
rename from test/Handler/ZipSpec.hs
rename to test/Handler/Utils/ZipSpec.hs
index 6d9eb663d..b384143fd 100644
--- a/test/Handler/ZipSpec.hs
+++ b/test/Handler/Utils/ZipSpec.hs
@@ -2,11 +2,11 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Handler.ZipSpec where
+module Handler.Utils.ZipSpec where
 
 import TestImport
 
-import Handler.Zip
+import Handler.Utils.Zip
 
 import System.FilePath