diff --git a/Command/RecvKey.hs b/Command/RecvKey.hs
index b49116de45..e2f7c74abb 100644
--- a/Command/RecvKey.hs
+++ b/Command/RecvKey.hs
@@ -14,7 +14,7 @@ import Command
 import CmdLine
 import Content
 import Utility
-import RsyncFile
+import Utility.RsyncFile
 
 command :: [Command]
 command = [repoCommand "recvkey" paramKey seek
diff --git a/Command/SendKey.hs b/Command/SendKey.hs
index c2f793f8fe..02fedb349e 100644
--- a/Command/SendKey.hs
+++ b/Command/SendKey.hs
@@ -15,7 +15,7 @@ import qualified Annex
 import Command
 import Content
 import Utility
-import RsyncFile
+import Utility.RsyncFile
 import Messages
 
 command :: [Command]
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 8a897c3657..d189545f5d 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -16,7 +16,7 @@ import Types
 import Messages
 import Locations
 import Content
-import CopyFile
+import Utility.CopyFile
 import Utility
 
 command :: [Command]
diff --git a/Crypto.hs b/Crypto.hs
index e84e397f2e..485fb6e931 100644
--- a/Crypto.hs
+++ b/Crypto.hs
@@ -46,7 +46,7 @@ import Types
 import Types.Key
 import Types.Remote
 import Utility
-import Base64
+import Utility.Base64
 import Types.Crypto
 
 {- The first half of a Cipher is used for HMAC; the remainder
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 991ccbe481..05d42136f1 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -22,7 +22,7 @@ import qualified Git
 import qualified Annex
 import UUID
 import Locations
-import CopyFile
+import Utility.CopyFile
 import Config
 import Content
 import Utility
diff --git a/Remote/Git.hs b/Remote/Git.hs
index b4006d7fd1..4a8f8ee928 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -22,8 +22,8 @@ import UUID
 import Utility
 import qualified Content
 import Messages
-import CopyFile
-import RsyncFile
+import Utility.CopyFile
+import Utility.RsyncFile
 import Ssh
 import Config
 
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index aa2507fff4..80e194fed1 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -29,7 +29,7 @@ import Remote.Special
 import Remote.Encryptable
 import Crypto
 import Messages
-import RsyncFile
+import Utility.RsyncFile
 
 type RsyncUrl = String
 
diff --git a/Remote/S3real.hs b/Remote/S3real.hs
index 829c58ad06..52d1ed1be1 100644
--- a/Remote/S3real.hs
+++ b/Remote/S3real.hs
@@ -37,7 +37,7 @@ import Remote.Special
 import Remote.Encryptable
 import Crypto
 import Content
-import Base64
+import Utility.Base64
 
 remote :: RemoteType Annex
 remote = RemoteType {
diff --git a/Base64.hs b/Utility/Base64.hs
similarity index 88%
rename from Base64.hs
rename to Utility/Base64.hs
index 153049751d..dd739fd4fb 100644
--- a/Base64.hs
+++ b/Utility/Base64.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Base64 (toB64, fromB64) where
+module Utility.Base64 (toB64, fromB64) where
 
 import Codec.Binary.Base64
 import Data.Bits.Utils
diff --git a/CopyFile.hs b/Utility/CopyFile.hs
similarity index 94%
rename from CopyFile.hs
rename to Utility/CopyFile.hs
index b08ede3c88..5ee4a91df7 100644
--- a/CopyFile.hs
+++ b/Utility/CopyFile.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module CopyFile (copyFile) where
+module Utility.CopyFile (copyFile) where
 
 import System.Directory (doesFileExist, removeFile)
 
diff --git a/RsyncFile.hs b/Utility/RsyncFile.hs
similarity index 97%
rename from RsyncFile.hs
rename to Utility/RsyncFile.hs
index 48d927fcf2..c68909d2dc 100644
--- a/RsyncFile.hs
+++ b/Utility/RsyncFile.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module RsyncFile where
+module Utility.RsyncFile where
 
 import Data.String.Utils