From cab4ac247ca990a03537f7611b299efca8edaffe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 5 Jul 2011 20:36:43 -0400
Subject: [PATCH] rename

---
 Command/Fsck.hs                      | 2 +-
 Command/Map.hs                       | 4 ++--
 Command/Status.hs                    | 2 +-
 Content.hs                           | 2 +-
 Remote/Bup.hs                        | 2 +-
 Remote/Git.hs                        | 2 +-
 Ssh.hs => Remote/Ssh.hs              | 4 ++--
 DataUnits.hs => Utility/DataUnits.hs | 2 +-
 Dot.hs => Utility/Dot.hs             | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename Ssh.hs => Remote/Ssh.hs (96%)
 rename DataUnits.hs => Utility/DataUnits.hs (99%)
 rename Dot.hs => Utility/Dot.hs (97%)

diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 446d25a449..ec3f1d8e7d 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -26,7 +26,7 @@ import Content
 import LocationLog
 import Locations
 import Trust
-import DataUnits
+import Utility.DataUnits
 import Config
 
 command :: [Command]
diff --git a/Command/Map.hs b/Command/Map.hs
index 940db54c89..0391ab8e8f 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -21,8 +21,8 @@ import Types
 import Utility
 import UUID
 import Trust
-import Ssh
-import qualified Dot
+import Remote.Ssh
+import qualified Utility.Dot as Dot
 
 -- a link from the first repository to the second (its remote)
 data Link = Link Git.Repo Git.Repo
diff --git a/Command/Status.hs b/Command/Status.hs
index 2448f65a40..1ec4782362 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -21,7 +21,7 @@ import qualified Command.Unused
 import qualified Git
 import Command
 import Types
-import DataUnits
+import Utility.DataUnits
 import Content
 import Types.Key
 import Locations
diff --git a/Content.hs b/Content.hs
index a2f38ddc96..94f8b8c2ac 100644
--- a/Content.hs
+++ b/Content.hs
@@ -43,7 +43,7 @@ import qualified Branch
 import Utility
 import StatFS
 import Types.Key
-import DataUnits
+import Utility.DataUnits
 import Config
 
 {- Checks if a given key is currently present in the gitAnnexLocation. -}
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 11c0ec4daf..5a44397f0d 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -28,7 +28,7 @@ import Locations
 import Config
 import Utility
 import Messages
-import Ssh
+import Remote.Ssh
 import Remote.Special
 import Remote.Encryptable
 import Crypto
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 4a8f8ee928..fb85123825 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -24,7 +24,7 @@ import qualified Content
 import Messages
 import Utility.CopyFile
 import Utility.RsyncFile
-import Ssh
+import Remote.Ssh
 import Config
 
 remote :: RemoteType Annex
diff --git a/Ssh.hs b/Remote/Ssh.hs
similarity index 96%
rename from Ssh.hs
rename to Remote/Ssh.hs
index 21e72c0839..0d4842a1ab 100644
--- a/Ssh.hs
+++ b/Remote/Ssh.hs
@@ -1,11 +1,11 @@
-{- git-annex repository access with ssh
+{- git-annex remote access with ssh
  -
  - Copyright 2011 Joey Hess <joey@kitenet.net>
  -
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Ssh where
+module Remote.Ssh where
 
 import Control.Monad.State (liftIO)
 
diff --git a/DataUnits.hs b/Utility/DataUnits.hs
similarity index 99%
rename from DataUnits.hs
rename to Utility/DataUnits.hs
index c81c6e42e5..7af2eadafb 100644
--- a/DataUnits.hs
+++ b/Utility/DataUnits.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module DataUnits (
+module Utility.DataUnits (
 	dataUnits,
 	storageUnits,
 	memoryUnits,
diff --git a/Dot.hs b/Utility/Dot.hs
similarity index 97%
rename from Dot.hs
rename to Utility/Dot.hs
index deba10201e..8696849963 100644
--- a/Dot.hs
+++ b/Utility/Dot.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Dot where -- import qualified
+module Utility.Dot where -- import qualified
 
 {- generates a graph description from a list of lines -}
 graph :: [String] -> String