let's put type modules under the parent module, not in a Types directory

Assistant/Threads/Merger.hs

@@ -13,7 +13,7 @@ import Assistant.BranchChange
 import Assistant.DaemonStatus
 import Assistant.ScanRemotes
 import Utility.DirWatcher
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 import qualified Annex.Branch
 import qualified Git
 import qualified Git.Branch

Assistant/Threads/TransferWatcher.hs

@@ -14,7 +14,7 @@ import Assistant.Drop
 import Annex.Content
 import Logs.Transfer
 import Utility.DirWatcher
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 import qualified Remote
 
 import Control.Concurrent

Assistant/Threads/Watcher.hs

@@ -22,7 +22,7 @@ import Assistant.Changes
 import Assistant.Types.Changes
 import Assistant.Alert
 import Utility.DirWatcher
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 import Utility.Lsof
 import qualified Annex
 import qualified Annex.Queue

Utility/DirWatcher.hs

@@ -13,7 +13,7 @@
 
 module Utility.DirWatcher where
 
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 
 #if WITH_INOTIFY
 import qualified Utility.INotify as INotify

Utility/DirWatcher/Types.hs

@@ -5,9 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE CPP #-}
-
-module Utility.Types.DirWatcher where
+module Utility.DirWatcher.Types where
 
 import Common
 

Utility/FSEvents.hs

@@ -8,7 +8,7 @@
 module Utility.FSEvents where
 
 import Common hiding (isDirectory)
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 
 import System.OSX.FSEvents
 import qualified System.Posix.Files as Files

Utility/INotify.hs

@@ -9,7 +9,7 @@ module Utility.INotify where
 
 import Common hiding (isDirectory)
 import Utility.ThreadLock
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 
 import System.INotify
 import qualified System.Posix.Files as Files

Utility/Kqueue.hs

@@ -18,7 +18,7 @@ module Utility.Kqueue (
 ) where
 
 import Common
-import Utility.Types.DirWatcher
+import Utility.DirWatcher.Types
 
 import System.Posix.Types
 import Foreign.C.Types