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

5 files changed, 5 insertions, 7 deletions

diff --git a/Utility/DirWatcher.hs b/Utility/DirWatcher.hs
index ba420401e..d038f59ac 100644
--- a/Utility/DirWatcher.hs
+++ b/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
diff --git a/Utility/Types/DirWatcher.hs b/Utility/DirWatcher/Types.hs
index 30ada9c68..8cfa69d34 100644
--- a/Utility/Types/DirWatcher.hs
+++ b/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
 
diff --git a/Utility/FSEvents.hs b/Utility/FSEvents.hs
index af8c2fc2f..d6663e9d7 100644
--- a/Utility/FSEvents.hs
+++ b/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
diff --git a/Utility/INotify.hs b/Utility/INotify.hs
index 2b5789479..7b5a1fbea 100644
--- a/Utility/INotify.hs
+++ b/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
diff --git a/Utility/Kqueue.hs b/Utility/Kqueue.hs
index f0559e531..eb5feab00 100644
--- a/Utility/Kqueue.hs
+++ b/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