Started a rather large reorganization.messy-exchanges

1 files changed, 12 insertions, 13 deletions

diff --git a/elm/battlemap/src/Update.elm b/elm/battlemap/src/Update.elm
index 0947e99..c6146e1 100644
--- a/elm/battlemap/src/Update.elm
+++ b/elm/battlemap/src/Update.elm
@@ -3,11 +3,10 @@ module Update exposing (update)
 import Event
 
 import Model
-
-import Update.DirectionRequest
-import Update.SelectTile
-import Update.SelectCharacter
-import Update.EndTurn
+import Model.RequestDirection
+import Model.SelectTile
+import Model.SelectCharacter
+import Model.EndTurn
 
 update : Event.Type -> Model.Type -> Model.Type
 update event model =
@@ -15,14 +14,14 @@ update event model =
       new_model = (Model.clear_error model)
    in
    case event of
-      (Event.DirectionRequest d) ->
-         (Update.DirectionRequest.apply_to new_model d)
+      (Event.DirectionRequested d) ->
+         (Model.DirectionRequest.apply_to new_model d)
 
-      (Event.SelectTile loc) ->
-         (Update.SelectTile.apply_to new_model loc)
+      (Event.TileSelected loc) ->
+         (Model.SelectTile.apply_to new_model loc)
 
-      (Event.SelectCharacter char_id) ->
-         (Update.SelectCharacter.apply_to new_model char_id)
+      (Event.CharacterSelected char_id) ->
+         (Model.SelectCharacter.apply_to new_model char_id)
 
-      Event.EndTurn ->
-         (Update.EndTurn.apply_to new_model)
+      Event.TurnEnded ->
+         (Model.EndTurn.apply_to new_model)