reorg threads

Assistant.hs

@@ -59,11 +59,11 @@ import Assistant.ThreadedMonad
 import Assistant.DaemonStatus
 import Assistant.Changes
 import Assistant.Commits
-import Assistant.Watcher
-import Assistant.Committer
-import Assistant.Pusher
-import Assistant.Merger
-import Assistant.SanityChecker
+import Assistant.Threads.Watcher
+import Assistant.Threads.Committer
+import Assistant.Threads.Pusher
+import Assistant.Threads.Merger
+import Assistant.Threads.SanityChecker
 import qualified Utility.Daemon
 import Utility.LogFile
 

Assistant/Threads/Committer.hs

@@ -5,13 +5,13 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Assistant.Committer where
+module Assistant.Threads.Committer where
 
 import Common.Annex
 import Assistant.Changes
 import Assistant.Commits
 import Assistant.ThreadedMonad
-import Assistant.Watcher
+import Assistant.Threads.Watcher
 import qualified Annex
 import qualified Annex.Queue
 import qualified Git.Command

Assistant/Threads/Merger.hs

@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Assistant.Merger where
+module Assistant.Threads.Merger where
 
 import Common.Annex
 import Assistant.ThreadedMonad

Assistant/Threads/Pusher.hs

@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Assistant.Pusher where
+module Assistant.Threads.Pusher where
 
 import Common.Annex
 import Assistant.Commits

Assistant/Threads/SanityChecker.hs

@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-module Assistant.SanityChecker (
+module Assistant.Threads.SanityChecker (
 	sanityCheckerThread
 ) where
 
@@ -15,7 +15,7 @@ import Assistant.DaemonStatus
 import Assistant.ThreadedMonad
 import Assistant.Changes
 import Utility.ThreadScheduler
-import qualified Assistant.Watcher
+import qualified Assistant.Threads.Watcher as Watcher
 
 import Data.Time.Clock.POSIX
 
@@ -79,5 +79,5 @@ check st status changechan = do
 		insanity m = runThreadState st $ warning m
 		addsymlink file s = do
 			insanity $ "found unstaged symlink: " ++ file
-			Assistant.Watcher.runHandler st status changechan
-				Assistant.Watcher.onAddSymlink file s
+			Watcher.runHandler st status changechan
+				Watcher.onAddSymlink file s

Assistant/Threads/Watcher.hs

@@ -7,7 +7,7 @@
 
 {-# LANGUAGE CPP #-}
 
-module Assistant.Watcher where
+module Assistant.Threads.Watcher where
 
 import Common.Annex
 import Assistant.ThreadedMonad