rename

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

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]

Command/Unlock.hs

@@ -16,7 +16,7 @@ import Types
 import Messages
 import Locations
 import Content
-import CopyFile
+import Utility.CopyFile
 import Utility
 
 command :: [Command]

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

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

Remote/Git.hs

@@ -22,8 +22,8 @@ import UUID
 import Utility
 import qualified Content
 import Messages
-import CopyFile
+import Utility.CopyFile
-import RsyncFile
+import Utility.RsyncFile
 import Ssh
 import Config
 

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
 

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 {

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

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)
 

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