Start to rework composition of trees

src/Dodge/Room/Boss.hs

@@ -12,7 +12,7 @@ import Dodge.Room.Path
 --import Dodge.LevelGen.Data
 import Dodge.Creature
 import Dodge.RandomHelp
-import Dodge.Layout.Tree.Polymorphic
+import Dodge.Tree
 import Geometry
 
 import Data.Tree

src/Dodge/Room/Branch.hs

@@ -9,7 +9,7 @@ import Dodge.Room.Door
 import Dodge.Room.Link
 import Dodge.Room.Procedural
 --import Dodge.LevelGen.Data
-import Dodge.Layout.Tree.Polymorphic
+import Dodge.Tree
 
 import Control.Monad.State
 import System.Random

src/Dodge/Room/RoadBlock.hs

@@ -12,7 +12,7 @@ import Dodge.Room.Corridor
 --import Dodge.Default.Wall
 import Dodge.RandomHelp
 import Dodge.Creature
-import Dodge.Layout.Tree.Polymorphic
+import Dodge.Tree
 
 import Data.Tree
 import Control.Monad.State

src/Dodge/Room/Room.hs

@@ -8,8 +8,7 @@ import Dodge.Room.Foreground
 import Dodge.LevelGen.Data
 import Dodge.RandomHelp
 import Dodge.Default.Wall
-import Dodge.Layout.Tree.Polymorphic
-import Dodge.Layout.Tree.Either
+import Dodge.Tree
 import Dodge.Placement.Instance
 --import Dodge.LevelGen.Data
 import Dodge.Room.Procedural

src/Dodge/Room/RunPast.hs

@@ -13,7 +13,7 @@ import Dodge.Room.Corridor
 --import Dodge.Room.RoadBlock
 import Dodge.PlacementSpot
 import Dodge.Placement.Instance
-import Dodge.Layout.Tree.Polymorphic
+import Dodge.Tree
 import Dodge.Item.Random
 --import Dodge.Item.Weapon.SprayGuns
 --import Dodge.Item.Weapon.Grenade

src/Dodge/Room/Start.hs

@@ -5,7 +5,7 @@ import Dodge.PlacementSpot
 import Dodge.Room.RunPast
 import Dodge.Data
 import Dodge.Default
-import Dodge.Layout.Tree.Either
+import Dodge.Tree
 import Dodge.RandomHelp
 import Dodge.Room.Door
 import Dodge.Room.Corridor
@@ -15,7 +15,6 @@ import Dodge.Room.Procedural
 import Dodge.Room.Foreground
 import Dodge.Room.RoadBlock
 import Dodge.Placement.Instance
-import Dodge.Layout.Tree.Polymorphic
 import Dodge.Item.Random
 import Dodge.Item.Weapon.BulletGuns
 import Dodge.Item.Weapon.Utility