Cleanup

src/Dodge/Data.hs

@@ -22,8 +22,6 @@ module Dodge.Data (
     module Dodge.Data.WorldEffect,
     module Dodge.Data.Button,
     module Dodge.Data.Beam,
-    module Dodge.Data.Targeting,
-    module Dodge.Data.ItEffect,
     module Dodge.Data.Hammer,
     module Dodge.Data.ArcStep,
     module Dodge.Data.CrWlID,
@@ -54,14 +52,12 @@ module Dodge.Data (
     module Dodge.Data.Zoning,
     module Dodge.Data.Bounds,
     module Dodge.Data.Sensor,
-    module Dodge.Combine.Data,
-    module Dodge.Distortion.Data,
+    module Dodge.Data.Distortion,
     module Dodge.Data.Damage,
     module Dodge.Data.SoundOrigin,
-    module Dodge.Config.Data,
+    module Dodge.Data.Config,
     module MaybeHelp,
-    module Dodge.Data.ItemAmount,
-    module Dodge.RoomCluster.Data,
+    module Dodge.Data.RoomCluster,
     module Dodge.Data.Room,
     module Dodge.Data.RadarBlip,
     module Dodge.Data.PathGraph,
@@ -93,8 +89,7 @@ import Data.Preload
 import qualified Data.Set as S
 import qualified Data.Text as T
 import Data.Tile
-import Dodge.Combine.Data
-import Dodge.Config.Data
+import Dodge.Data.Config
 import Dodge.Config.KeyConfig
 import Dodge.Data.ActionPlan
 import Dodge.Data.Ammo
@@ -122,9 +117,7 @@ import Dodge.Data.GenParams
 import Dodge.Data.Gust
 import Dodge.Data.HUD
 import Dodge.Data.Hammer
-import Dodge.Data.ItEffect
 import Dodge.Data.Item
-import Dodge.Data.ItemAmount
 import Dodge.Data.Laser
 import Dodge.Data.LightSource
 import Dodge.Data.LinearShockwave
@@ -149,15 +142,14 @@ import Dodge.Data.Sensor
 import Dodge.Data.Shockwave
 import Dodge.Data.SoundOrigin
 import Dodge.Data.Spark
-import Dodge.Data.Targeting
 import Dodge.Data.Terminal
 import Dodge.Data.TeslaArc
 import Dodge.Data.TractorBeam
 import Dodge.Data.Wall
 import Dodge.Data.WorldEffect
 import Dodge.Data.Zoning
-import Dodge.Distortion.Data
-import Dodge.RoomCluster.Data
+import Dodge.Data.Distortion
+import Dodge.Data.RoomCluster
 import GHC.Generics
 import Geometry.Data
 import qualified IntMapHelp as IM