Start to rework composition of trees

src/Dodge/Floor.hs

@@ -8,10 +8,8 @@ import Dodge.Data
 import Dodge.Creature.State.Data
 import Dodge.Room
 import Dodge.Placement.Instance.Button
-import Dodge.Layout.Tree.Polymorphic
-import Dodge.Layout.Tree.Either
+import Dodge.Tree
 import Dodge.Annotation
-import Dodge.Layout.Tree.Shift
 import Dodge.Creature
 import Dodge.LevelGen.Data
 import Dodge.LevelGen.Switch
@@ -106,7 +104,7 @@ layoutLevelFromSeed i seed = do
     let rmtree = inorderNumberTree $ evalState initialRoomTree g
     putStrLn "Abstract layout: "
     putStrLn $ compactDrawTree $ fmap (show . snd) rmtree
-    mrs <- positionRooms rmtree
+    mrs <- positionRoomsFromTree rmtree
     case mrs of
         Just rs -> do
             putStrLn $ "After " ++ show i'