103 files changed, 509 insertions, 505 deletions

diff --git a/Makefile b/Makefile
index b4f8d72..68fd02c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 ## CONFIG ######################################################################
 ################################################################################
-MODULES ?= battlemap global asset map-editor
+MODULES ?= battle global asset map-editor
 
 SRC_DIR = ${CURDIR}/src
 WWW_DIR = ${CURDIR}/www
diff --git a/src/battlemap/Makefile b/src/battle/Makefile
index 3b58a08..3b58a08 100644
--- a/src/battlemap/Makefile
+++ b/src/battle/Makefile
diff --git a/src/battlemap/elm-package.json b/src/battle/elm-package.json
index 43957bf..43957bf 100644
--- a/src/battlemap/elm-package.json
+++ b/src/battle/elm-package.json
diff --git a/src/battlemap/src/Action/Scroll.elm b/src/battle/src/Action/Scroll.elm
index b949fc7..cf071ae 100644
--- a/src/battlemap/src/Action/Scroll.elm
+++ b/src/battle/src/Action/Scroll.elm
@@ -6,7 +6,7 @@ import Dom.Scroll
 
 import Task
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.UI
 
 import Struct.UI
diff --git a/src/battlemap/src/Comm/AddArmor.elm b/src/battle/src/Comm/AddArmor.elm
index ad9df3e..480b823 100644
--- a/src/battlemap/src/Comm/AddArmor.elm
+++ b/src/battle/src/Comm/AddArmor.elm
@@ -3,7 +3,7 @@ module Comm.AddArmor exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Armor
 import Struct.ServerReply
 
diff --git a/src/battlemap/src/Comm/AddChar.elm b/src/battle/src/Comm/AddChar.elm
index ebe8656..32227a8 100644
--- a/src/battlemap/src/Comm/AddChar.elm
+++ b/src/battle/src/Comm/AddChar.elm
@@ -3,7 +3,7 @@ module Comm.AddChar exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.ServerReply
 
diff --git a/src/battlemap/src/Comm/AddTile.elm b/src/battle/src/Comm/AddTile.elm
index d0a3ce8..64cf0ea 100644
--- a/src/battlemap/src/Comm/AddTile.elm
+++ b/src/battle/src/Comm/AddTile.elm
@@ -3,7 +3,7 @@ module Comm.AddTile exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Tile
 import Struct.ServerReply
 
diff --git a/src/battlemap/src/Comm/AddWeapon.elm b/src/battle/src/Comm/AddWeapon.elm
index b41c054..7061dea 100644
--- a/src/battlemap/src/Comm/AddWeapon.elm
+++ b/src/battle/src/Comm/AddWeapon.elm
@@ -3,7 +3,7 @@ module Comm.AddWeapon exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Weapon
 import Struct.ServerReply
 
diff --git a/src/battlemap/src/Comm/CharacterTurn.elm b/src/battle/src/Comm/CharacterTurn.elm
index c0fc96f..36dfd96 100644
--- a/src/battlemap/src/Comm/CharacterTurn.elm
+++ b/src/battle/src/Comm/CharacterTurn.elm
@@ -3,7 +3,7 @@ module Comm.CharacterTurn exposing (try)
 -- Elm -------------------------------------------------------------------------
 import Json.Encode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.IO
 
 import Comm.Send
@@ -101,7 +101,7 @@ try_encoding model =
                [
                   ("stk", (Json.Encode.string model.session_token)),
                   ("pid", (Json.Encode.string model.player_id)),
-                  ("bid", (Json.Encode.string model.battlemap_id)),
+                  ("bid", (Json.Encode.string model.battle_id)),
                   (
                      "cix",
                      (Json.Encode.int (Struct.Character.get_index char))
diff --git a/src/battlemap/src/Comm/LoadBattlemap.elm b/src/battle/src/Comm/LoadBattle.elm
index cd29acf..df4e9dd 100644
--- a/src/battlemap/src/Comm/LoadBattlemap.elm
+++ b/src/battle/src/Comm/LoadBattle.elm
@@ -1,9 +1,9 @@
-module Comm.LoadBattlemap exposing (try)
+module Comm.LoadBattle exposing (try)
 
 -- Elm -------------------------------------------------------------------------
 import Json.Encode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Comm.Send
 
 import Constants.IO
@@ -25,7 +25,7 @@ try_encoding model =
          [
             ("stk", (Json.Encode.string model.session_token)),
             ("pid", (Json.Encode.string model.player_id)),
-            ("bmi", (Json.Encode.string model.battlemap_id))
+            ("bid", (Json.Encode.string model.battle_id))
          ]
       )
    )
@@ -37,6 +37,6 @@ try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type))
 try model =
    (Comm.Send.try_sending
       model
-      Constants.IO.battlemap_loading_handler
+      Constants.IO.map_loading_handler
       try_encoding
    )
diff --git a/src/battlemap/src/Comm/Send.elm b/src/battle/src/Comm/Send.elm
index a6129cd..98e3ba4 100644
--- a/src/battlemap/src/Comm/Send.elm
+++ b/src/battle/src/Comm/Send.elm
@@ -6,7 +6,7 @@ import Http
 import Json.Decode
 import Json.Encode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Comm.AddArmor
 import Comm.AddChar
 import Comm.AddTile
diff --git a/src/battlemap/src/Comm/SetMap.elm b/src/battle/src/Comm/SetMap.elm
index dc499cf..7bfd56f 100644
--- a/src/battlemap/src/Comm/SetMap.elm
+++ b/src/battle/src/Comm/SetMap.elm
@@ -3,8 +3,8 @@ module Comm.SetMap exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
-import Struct.Battlemap
+-- Map -------------------------------------------------------------------
+import Struct.Map
 import Struct.ServerReply
 import Struct.Tile
 
@@ -34,7 +34,7 @@ deserialize_tile_instance map_width index id =
 internal_decoder : MapData -> Struct.ServerReply.Type
 internal_decoder map_data =
    (Struct.ServerReply.SetMap
-      (Struct.Battlemap.new
+      (Struct.Map.new
          map_data.w
          map_data.h
          (List.indexedMap
diff --git a/src/battlemap/src/Comm/SetTimeline.elm b/src/battle/src/Comm/SetTimeline.elm
index a432f3a..3956ec3 100644
--- a/src/battlemap/src/Comm/SetTimeline.elm
+++ b/src/battle/src/Comm/SetTimeline.elm
@@ -3,7 +3,7 @@ module Comm.SetTimeline exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.ServerReply
 import Struct.TurnResult
 
diff --git a/src/battlemap/src/Comm/TurnResults.elm b/src/battle/src/Comm/TurnResults.elm
index abeb932..f8727e1 100644
--- a/src/battlemap/src/Comm/TurnResults.elm
+++ b/src/battle/src/Comm/TurnResults.elm
@@ -3,7 +3,7 @@ module Comm.TurnResults exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.ServerReply
 import Struct.TurnResult
 
diff --git a/src/battle/src/Constants/IO.elm.m4 b/src/battle/src/Constants/IO.elm.m4
new file mode 100644
index 0000000..e91cdc0
--- /dev/null
+++ b/src/battle/src/Constants/IO.elm.m4
@@ -0,0 +1,16 @@
+module Constants.IO exposing (..)
+
+base_url : String
+base_url = "__CONF_SERVER_URL"
+
+map_handler_url : String
+map_handler_url = (base_url ++ "/handler/map")
+
+character_turn_handler : String
+character_turn_handler = (map_handler_url ++ "/btl_character_turn")
+
+map_loading_handler : String
+map_loading_handler = (map_handler_url ++ "/btl_load_state")
+
+tile_assets_url : String
+tile_assets_url = (base_url ++ "/asset/svg/tile/")
diff --git a/src/battlemap/src/Constants/Movement.elm b/src/battle/src/Constants/Movement.elm
index a2a5c1e..a2a5c1e 100644
--- a/src/battlemap/src/Constants/Movement.elm
+++ b/src/battle/src/Constants/Movement.elm
diff --git a/src/battlemap/src/Constants/UI.elm b/src/battle/src/Constants/UI.elm
index 4c70388..e56553a 100644
--- a/src/battlemap/src/Constants/UI.elm
+++ b/src/battle/src/Constants/UI.elm
@@ -7,7 +7,7 @@ variants_per_tile : Int
 variants_per_tile = 9
 
 viewer_html_id : String
-viewer_html_id = "battlemap_viewer"
+viewer_html_id = "map_viewer"
 
 half_viewer_min_width : Float
 half_viewer_min_width = 109.0
diff --git a/src/battlemap/src/ElmModule/Init.elm b/src/battle/src/ElmModule/Init.elm
index 83c2c58..4fccd82 100644
--- a/src/battlemap/src/ElmModule/Init.elm
+++ b/src/battle/src/ElmModule/Init.elm
@@ -2,8 +2,8 @@ module ElmModule.Init exposing (init)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
-import Comm.LoadBattlemap
+-- Map -------------------------------------------------------------------
+import Comm.LoadBattle
 
 import Struct.Event
 import Struct.Flags
@@ -21,7 +21,7 @@ init flags =
    let model = (Struct.Model.new flags) in
       (
          model,
-         (case (Comm.LoadBattlemap.try model) of
+         (case (Comm.LoadBattle.try model) of
             (Just cmd) -> cmd
             Nothing -> Cmd.none
          )
diff --git a/src/battlemap/src/ElmModule/Subscriptions.elm b/src/battle/src/ElmModule/Subscriptions.elm
index f342b30..fe276f4 100644
--- a/src/battlemap/src/ElmModule/Subscriptions.elm
+++ b/src/battle/src/ElmModule/Subscriptions.elm
@@ -2,7 +2,7 @@ module ElmModule.Subscriptions exposing (..)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 
diff --git a/src/battlemap/src/ElmModule/Update.elm b/src/battle/src/ElmModule/Update.elm
index 3b23963..eafac01 100644
--- a/src/battlemap/src/ElmModule/Update.elm
+++ b/src/battle/src/ElmModule/Update.elm
@@ -2,7 +2,7 @@ module ElmModule.Update exposing (update)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.Model
 
@@ -19,7 +19,7 @@ import Update.SelectCharacter
 import Update.SelectCharacterOrTile
 import Update.SelectTab
 import Update.SelectTile
-import Update.SendLoadBattlemapRequest
+import Update.SendLoadBattleRequest
 import Update.SetRequestedHelp
 import Update.SwitchTeam
 import Update.SwitchWeapon
@@ -90,8 +90,8 @@ update event model =
       Struct.Event.DebugTestAnimation ->
          (Update.TestAnimation.apply_to new_model)
 
-      (Struct.Event.DebugLoadBattlemapRequest) ->
-         (Update.SendLoadBattlemapRequest.apply_to new_model)
+      (Struct.Event.DebugLoadBattleRequest) ->
+         (Update.SendLoadBattleRequest.apply_to new_model)
 
       (Struct.Event.ServerReplied result) ->
          (Update.HandleServerReply.apply_to model result)
diff --git a/src/battlemap/src/ElmModule/View.elm b/src/battle/src/ElmModule/View.elm
index 49b88fe..069b0bf 100644
--- a/src/battlemap/src/ElmModule/View.elm
+++ b/src/battle/src/ElmModule/View.elm
@@ -5,13 +5,13 @@ import Html
 import Html.Lazy
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.UI
 
 import Struct.Event
 import Struct.Model
 
-import View.Battlemap
+import View.Map
 import View.Controlled
 import View.MessageBoard
 import View.MainMenu
@@ -39,15 +39,15 @@ view model =
          ),
          (Html.div
             [
-               (Html.Attributes.class "battlemap-container-centerer")
+               (Html.Attributes.class "battle-container-centerer")
             ]
             [
                (Html.div
                   [
-                     (Html.Attributes.class "battlemap-container"),
+                     (Html.Attributes.class "battle-container"),
                      (Html.Attributes.id Constants.UI.viewer_html_id)
                   ]
-                  [(View.Battlemap.get_html model)]
+                  [(View.Map.get_html model)]
                )
             ]
          ),
diff --git a/src/battlemap/src/Main.elm b/src/battle/src/Main.elm
index 0d22cd5..8140041 100644
--- a/src/battlemap/src/Main.elm
+++ b/src/battle/src/Main.elm
@@ -1,7 +1,7 @@
 -- Elm ------------------------------------------------------------------------
 import Html
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 import Struct.Flags
diff --git a/src/battlemap/src/Struct/Armor.elm b/src/battle/src/Struct/Armor.elm
index 58f27d7..04a0428 100644
--- a/src/battlemap/src/Struct/Armor.elm
+++ b/src/battle/src/Struct/Armor.elm
@@ -18,7 +18,7 @@ module Struct.Armor exposing
 import Json.Decode
 import Json.Decode.Pipeline
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Attributes
 import Struct.Weapon
 
diff --git a/src/battlemap/src/Struct/Attack.elm b/src/battle/src/Struct/Attack.elm
index 91844c4..377a413 100644
--- a/src/battlemap/src/Struct/Attack.elm
+++ b/src/battle/src/Struct/Attack.elm
@@ -13,7 +13,7 @@ import Array
 
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/Attributes.elm b/src/battle/src/Struct/Attributes.elm
index 407856d..50b4ad4 100644
--- a/src/battlemap/src/Struct/Attributes.elm
+++ b/src/battle/src/Struct/Attributes.elm
@@ -21,7 +21,7 @@ module Struct.Attributes exposing
 import Json.Decode
 import Json.Decode.Pipeline
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
 -- TYPES -----------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/Character.elm b/src/battle/src/Struct/Character.elm
index f361501..f854b44 100644
--- a/src/battlemap/src/Struct/Character.elm
+++ b/src/battle/src/Struct/Character.elm
@@ -32,7 +32,7 @@ module Struct.Character exposing
 import Json.Decode
 import Json.Decode.Pipeline
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Armor
 import Struct.Attributes
 import Struct.Location
diff --git a/src/battlemap/src/Struct/CharacterTurn.elm b/src/battle/src/Struct/CharacterTurn.elm
index 3b4c35d..ddc80d4 100644
--- a/src/battlemap/src/Struct/CharacterTurn.elm
+++ b/src/battle/src/Struct/CharacterTurn.elm
@@ -19,7 +19,7 @@ module Struct.CharacterTurn exposing
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Direction
 import Struct.Navigator
diff --git a/src/battlemap/src/Struct/Direction.elm b/src/battle/src/Struct/Direction.elm
index 600138c..6fd0a66 100644
--- a/src/battlemap/src/Struct/Direction.elm
+++ b/src/battle/src/Struct/Direction.elm
@@ -3,7 +3,7 @@ module Struct.Direction exposing (Type(..), opposite_of, to_string, decoder)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
 -- TYPES -----------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/Error.elm b/src/battle/src/Struct/Error.elm
index 5f40c09..5f40c09 100644
--- a/src/battlemap/src/Struct/Error.elm
+++ b/src/battle/src/Struct/Error.elm
diff --git a/src/battlemap/src/Struct/Event.elm b/src/battle/src/Struct/Event.elm
index 716718e..dedb606 100644
--- a/src/battlemap/src/Struct/Event.elm
+++ b/src/battle/src/Struct/Event.elm
@@ -3,7 +3,7 @@ module Struct.Event exposing (Type(..), attempted)
 -- Elm -------------------------------------------------------------------------
 import Http
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Direction
 import Struct.Error
 import Struct.Location
@@ -20,7 +20,7 @@ type Type =
    | AttackWithoutMovingRequest
    | CharacterInfoRequested Int
    | CharacterSelected Int
-   | DebugLoadBattlemapRequest
+   | DebugLoadBattleRequest
    | DebugTeamSwitchRequest
    | DebugTestAnimation
    | DirectionRequested Struct.Direction.Type
diff --git a/src/battlemap/src/Struct/Flags.elm b/src/battle/src/Struct/Flags.elm
index c0316f0..228d258 100644
--- a/src/battlemap/src/Struct/Flags.elm
+++ b/src/battle/src/Struct/Flags.elm
@@ -7,7 +7,7 @@ module Struct.Flags exposing
 -- Elm -------------------------------------------------------------------------
 import List
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Util.List
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/HelpRequest.elm b/src/battle/src/Struct/HelpRequest.elm
index 3357b56..a0693e2 100644
--- a/src/battlemap/src/Struct/HelpRequest.elm
+++ b/src/battle/src/Struct/HelpRequest.elm
@@ -2,7 +2,7 @@ module Struct.HelpRequest exposing (Type(..))
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/Location.elm b/src/battle/src/Struct/Location.elm
index d284d05..26e237c 100644
--- a/src/battlemap/src/Struct/Location.elm
+++ b/src/battle/src/Struct/Location.elm
@@ -4,7 +4,7 @@ module Struct.Location exposing (..)
 import Json.Decode
 import Json.Decode.Pipeline
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Direction
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/Battlemap.elm b/src/battle/src/Struct/Map.elm
index fee4901..9944b72 100644
--- a/src/battlemap/src/Struct/Battlemap.elm
+++ b/src/battle/src/Struct/Map.elm
@@ -1,4 +1,4 @@
-module Struct.Battlemap exposing
+module Struct.Map exposing
    (
       Type,
       empty,
@@ -14,7 +14,7 @@ module Struct.Battlemap exposing
 -- Elm -------------------------------------------------------------------------
 import Array
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Tile
 import Struct.Location
diff --git a/src/battlemap/src/Struct/Marker.elm b/src/battle/src/Struct/Marker.elm
index e3a051d..e3a051d 100644
--- a/src/battlemap/src/Struct/Marker.elm
+++ b/src/battle/src/Struct/Marker.elm
diff --git a/src/battlemap/src/Struct/Model.elm b/src/battle/src/Struct/Model.elm
index 0095364..aa4ce4a 100644
--- a/src/battlemap/src/Struct/Model.elm
+++ b/src/battle/src/Struct/Model.elm
@@ -22,9 +22,9 @@ import Array
 
 import Dict
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Armor
-import Struct.Battlemap
+import Struct.Map
 import Struct.Character
 import Struct.CharacterTurn
 import Struct.Error
@@ -45,14 +45,14 @@ type alias Type =
    {
       help_request: Struct.HelpRequest.Type,
       animator: (Maybe Struct.TurnResultAnimator.Type),
-      battlemap: Struct.Battlemap.Type,
+      map: Struct.Map.Type,
       characters: (Array.Array Struct.Character.Type),
       weapons: (Dict.Dict Struct.Weapon.Ref Struct.Weapon.Type),
       armors: (Dict.Dict Struct.Armor.Ref Struct.Armor.Type),
       tiles: (Dict.Dict Struct.Tile.Ref Struct.Tile.Type),
       error: (Maybe Struct.Error.Type),
       player_id: String,
-      battlemap_id: String,
+      battle_id: String,
       session_token: String,
       player_ix: Int,
       ui: Struct.UI.Type,
@@ -70,18 +70,18 @@ type alias Type =
 new : Struct.Flags.Type -> Type
 new flags =
    let
-      maybe_battlemap_id = (Struct.Flags.maybe_get_param "id" flags)
+      maybe_battle_id = (Struct.Flags.maybe_get_param "id" flags)
       model =
          {
             help_request = Struct.HelpRequest.None,
             animator = Nothing,
-            battlemap = (Struct.Battlemap.empty),
+            map = (Struct.Map.empty),
             characters = (Array.empty),
             weapons = (Dict.empty),
             armors = (Dict.empty),
             tiles = (Dict.empty),
             error = Nothing,
-            battlemap_id = "",
+            battle_id = "",
             player_id =
                (
                   if (flags.user_id == "")
@@ -95,17 +95,17 @@ new flags =
             timeline = (Array.empty)
          }
    in
-      case maybe_battlemap_id of
+      case maybe_battle_id of
          Nothing ->
             (invalidate
                (Struct.Error.new
                   Struct.Error.Failure
-                  "Could not find battlemap id."
+                  "Could not find battle id."
                )
                model
             )
 
-         (Just id) -> {model | battlemap_id = id}
+         (Just id) -> {model | battle_id = id}
 
 add_character : Struct.Character.Type -> Type -> Type
 add_character char model =
@@ -167,7 +167,7 @@ full_debug_reset model =
    {model |
       help_request = Struct.HelpRequest.None,
       animator = Nothing,
-      battlemap = (Struct.Battlemap.empty),
+      map = (Struct.Map.empty),
       characters = (Array.empty),
       weapons = (Dict.empty),
       armors = (Dict.empty),
diff --git a/src/battlemap/src/Struct/Navigator.elm b/src/battle/src/Struct/Navigator.elm
index 46ad92c..571115d 100644
--- a/src/battlemap/src/Struct/Navigator.elm
+++ b/src/battle/src/Struct/Navigator.elm
@@ -18,7 +18,7 @@ module Struct.Navigator exposing
 -- Elm -------------------------------------------------------------------------
 import Dict
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Location
 import Struct.Direction
 import Struct.Marker
diff --git a/src/battlemap/src/Struct/Path.elm b/src/battle/src/Struct/Path.elm
index 70f28ac..70e6980 100644
--- a/src/battlemap/src/Struct/Path.elm
+++ b/src/battle/src/Struct/Path.elm
@@ -11,7 +11,7 @@ module Struct.Path exposing
 -- Elm -------------------------------------------------------------------------
 import Set
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Direction
 import Struct.Location
 
diff --git a/src/battlemap/src/Struct/RangeIndicator.elm b/src/battle/src/Struct/RangeIndicator.elm
index 04eafe0..e78cecb 100644
--- a/src/battlemap/src/Struct/RangeIndicator.elm
+++ b/src/battle/src/Struct/RangeIndicator.elm
@@ -10,7 +10,7 @@ module Struct.RangeIndicator exposing
 import Dict
 import List
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Direction
 import Struct.Location
 import Struct.Marker
diff --git a/src/battlemap/src/Struct/ServerReply.elm b/src/battle/src/Struct/ServerReply.elm
index 5b88933..87325a5 100644
--- a/src/battlemap/src/Struct/ServerReply.elm
+++ b/src/battle/src/Struct/ServerReply.elm
@@ -2,9 +2,9 @@ module Struct.ServerReply exposing (Type(..))
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Armor
-import Struct.Battlemap
+import Struct.Map
 import Struct.Character
 import Struct.Tile
 import Struct.TurnResult
@@ -20,7 +20,7 @@ type Type =
    | AddWeapon Struct.Weapon.Type
    | AddCharacter (Struct.Character.Type, Int, Int, Int)
    | AddTile Struct.Tile.Type
-   | SetMap Struct.Battlemap.Type
+   | SetMap Struct.Map.Type
    | TurnResults (List Struct.TurnResult.Type)
    | SetTimeline (List Struct.TurnResult.Type)
 
diff --git a/src/battlemap/src/Struct/Statistics.elm b/src/battle/src/Struct/Statistics.elm
index 5b7eb87..aa3de39 100644
--- a/src/battlemap/src/Struct/Statistics.elm
+++ b/src/battle/src/Struct/Statistics.elm
@@ -16,7 +16,7 @@ module Struct.Statistics exposing
 -- Elm -------------------------------------------------------------------------
 import List
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Attributes
 import Struct.Armor
 import Struct.Weapon
diff --git a/src/battlemap/src/Struct/Tile.elm b/src/battle/src/Struct/Tile.elm
index a683be3..550169b 100644
--- a/src/battlemap/src/Struct/Tile.elm
+++ b/src/battle/src/Struct/Tile.elm
@@ -26,7 +26,7 @@ import List
 import Json.Decode
 import Json.Decode.Pipeline
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.UI
 import Constants.Movement
 
diff --git a/src/battlemap/src/Struct/TurnResult.elm b/src/battle/src/Struct/TurnResult.elm
index af3930d..c113994 100644
--- a/src/battlemap/src/Struct/TurnResult.elm
+++ b/src/battle/src/Struct/TurnResult.elm
@@ -23,7 +23,7 @@ import Array
 
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Attack
 import Struct.Character
 import Struct.Direction
diff --git a/src/battlemap/src/Struct/TurnResultAnimator.elm b/src/battle/src/Struct/TurnResultAnimator.elm
index 827b56e..200938e 100644
--- a/src/battlemap/src/Struct/TurnResultAnimator.elm
+++ b/src/battle/src/Struct/TurnResultAnimator.elm
@@ -10,7 +10,7 @@ module Struct.TurnResultAnimator exposing
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.TurnResult
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/UI.elm b/src/battle/src/Struct/UI.elm
index c8ef91e..4837434 100644
--- a/src/battlemap/src/Struct/UI.elm
+++ b/src/battle/src/Struct/UI.elm
@@ -25,7 +25,7 @@ module Struct.UI exposing
       set_previous_action
    )
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Location
 import Struct.Navigator
 
diff --git a/src/battlemap/src/Struct/Weapon.elm b/src/battle/src/Struct/Weapon.elm
index 248e8f8..d572ed6 100644
--- a/src/battlemap/src/Struct/Weapon.elm
+++ b/src/battle/src/Struct/Weapon.elm
@@ -26,7 +26,7 @@ module Struct.Weapon exposing
 import Json.Decode
 import Json.Decode.Pipeline
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Attributes
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Struct/WeaponSet.elm b/src/battle/src/Struct/WeaponSet.elm
index 444152d..de96daf 100644
--- a/src/battlemap/src/Struct/WeaponSet.elm
+++ b/src/battle/src/Struct/WeaponSet.elm
@@ -7,7 +7,7 @@ module Struct.WeaponSet exposing
       switch_weapons
    )
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Weapon
 
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/Update/AbortTurn.elm b/src/battle/src/Update/AbortTurn.elm
index 4fc1b04..efffcff 100644
--- a/src/battlemap/src/Update/AbortTurn.elm
+++ b/src/battle/src/Update/AbortTurn.elm
@@ -2,7 +2,7 @@ module Update.AbortTurn exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Event
 import Struct.Model
diff --git a/src/battlemap/src/Update/AttackWithoutMoving.elm b/src/battle/src/Update/AttackWithoutMoving.elm
index 7e0d154..3d64e57 100644
--- a/src/battlemap/src/Update/AttackWithoutMoving.elm
+++ b/src/battle/src/Update/AttackWithoutMoving.elm
@@ -2,7 +2,7 @@ module Update.AttackWithoutMoving exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Error
 import Struct.Event
diff --git a/src/battlemap/src/Update/ChangeScale.elm b/src/battle/src/Update/ChangeScale.elm
index a2e10ce..69e98b4 100644
--- a/src/battlemap/src/Update/ChangeScale.elm
+++ b/src/battle/src/Update/ChangeScale.elm
@@ -1,7 +1,7 @@
 module Update.ChangeScale exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.Model
 import Struct.UI
diff --git a/src/battlemap/src/Update/DisplayCharacterInfo.elm b/src/battle/src/Update/DisplayCharacterInfo.elm
index 1e2d9b8..e482e2f 100644
--- a/src/battlemap/src/Update/DisplayCharacterInfo.elm
+++ b/src/battle/src/Update/DisplayCharacterInfo.elm
@@ -3,7 +3,7 @@ module Update.DisplayCharacterInfo exposing (apply_to)
 import Array
 import Task
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Action.Scroll
 
 import Struct.Character
diff --git a/src/battlemap/src/Update/EndTurn.elm b/src/battle/src/Update/EndTurn.elm
index f2bd706..cb60b92 100644
--- a/src/battlemap/src/Update/EndTurn.elm
+++ b/src/battle/src/Update/EndTurn.elm
@@ -2,7 +2,7 @@ module Update.EndTurn exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Comm.CharacterTurn
 
 import Struct.Character
diff --git a/src/battlemap/src/Update/HandleAnimationEnded.elm b/src/battle/src/Update/HandleAnimationEnded.elm
index 6cedb43..90782e7 100644
--- a/src/battlemap/src/Update/HandleAnimationEnded.elm
+++ b/src/battle/src/Update/HandleAnimationEnded.elm
@@ -9,7 +9,7 @@ import Time
 
 import Task
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Action.Scroll
 
 import Struct.Character
diff --git a/src/battlemap/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm
index bc347c9..2352f67 100644
--- a/src/battlemap/src/Update/HandleServerReply.elm
+++ b/src/battle/src/Update/HandleServerReply.elm
@@ -11,9 +11,9 @@ import Http
 
 import Time
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Armor
-import Struct.Battlemap
+import Struct.Map
 import Struct.Character
 import Struct.Error
 import Struct.Event
@@ -100,7 +100,7 @@ add_character char_and_refs current_state =
             )
 
 set_map : (
-      Struct.Battlemap.Type ->
+      Struct.Map.Type ->
       (Struct.Model.Type, (Maybe Struct.Error.Type)) ->
       (Struct.Model.Type, (Maybe Struct.Error.Type))
    )
@@ -110,8 +110,8 @@ set_map map current_state =
       (model, _) ->
          (
             {model |
-               battlemap =
-                  (Struct.Battlemap.solve_tiles (Dict.values model.tiles) map)
+               map =
+                  (Struct.Map.solve_tiles (Dict.values model.tiles) map)
             },
             Nothing
          )
diff --git a/src/battlemap/src/Update/LookForCharacter.elm b/src/battle/src/Update/LookForCharacter.elm
index 469b0f8..7057451 100644
--- a/src/battlemap/src/Update/LookForCharacter.elm
+++ b/src/battle/src/Update/LookForCharacter.elm
@@ -3,7 +3,7 @@ module Update.LookForCharacter exposing (apply_to)
 import Array
 import Task
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Action.Scroll
 
 import Struct.Character
diff --git a/src/battlemap/src/Update/RequestDirection.elm b/src/battle/src/Update/RequestDirection.elm
index ce6084b..b6c8f13 100644
--- a/src/battlemap/src/Update/RequestDirection.elm
+++ b/src/battle/src/Update/RequestDirection.elm
@@ -2,7 +2,7 @@ module Update.RequestDirection exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Direction
 import Struct.Error
diff --git a/src/battlemap/src/Update/SelectCharacter.elm b/src/battle/src/Update/SelectCharacter.elm
index bbd4527..1137435 100644
--- a/src/battlemap/src/Update/SelectCharacter.elm
+++ b/src/battle/src/Update/SelectCharacter.elm
@@ -5,10 +5,10 @@ import Array
 
 import Task
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Action.Scroll
 
-import Struct.Battlemap
+import Struct.Map
 import Struct.Character
 import Struct.CharacterTurn
 import Struct.Error
@@ -43,8 +43,8 @@ get_character_navigator model char =
          )
          (Struct.Weapon.get_attack_range weapon)
          (Struct.Weapon.get_defense_range weapon)
-         (Struct.Battlemap.get_movement_cost_function
-            model.battlemap
+         (Struct.Map.get_movement_cost_function
+            model.map
             (Struct.Character.get_location char)
             (Array.toList model.characters)
          )
diff --git a/src/battlemap/src/Update/SelectCharacterOrTile.elm b/src/battle/src/Update/SelectCharacterOrTile.elm
index 997dfa8..4028d8e 100644
--- a/src/battlemap/src/Update/SelectCharacterOrTile.elm
+++ b/src/battle/src/Update/SelectCharacterOrTile.elm
@@ -2,7 +2,7 @@ module Update.SelectCharacterOrTile exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Event
 import Struct.Location
diff --git a/src/battlemap/src/Update/SelectTab.elm b/src/battle/src/Update/SelectTab.elm
index c25ec56..d15a463 100644
--- a/src/battlemap/src/Update/SelectTab.elm
+++ b/src/battle/src/Update/SelectTab.elm
@@ -1,7 +1,7 @@
 module Update.SelectTab exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 import Struct.UI
diff --git a/src/battlemap/src/Update/SelectTile.elm b/src/battle/src/Update/SelectTile.elm
index 6d05476..aa9215a 100644
--- a/src/battlemap/src/Update/SelectTile.elm
+++ b/src/battle/src/Update/SelectTile.elm
@@ -2,7 +2,7 @@ module Update.SelectTile exposing (apply_to)
 
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Direction
 import Struct.Error
diff --git a/src/battlemap/src/Update/SendLoadBattlemapRequest.elm b/src/battle/src/Update/SendLoadBattleRequest.elm
index bb6ae6b..9d8905c 100644
--- a/src/battlemap/src/Update/SendLoadBattlemapRequest.elm
+++ b/src/battle/src/Update/SendLoadBattleRequest.elm
@@ -1,8 +1,8 @@
-module Update.SendLoadBattlemapRequest exposing (apply_to)
+module Update.SendLoadBattleRequest exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
-import Comm.LoadBattlemap
+-- Map -------------------------------------------------------------------
+import Comm.LoadBattle
 
 import Struct.Event
 import Struct.Model
@@ -21,7 +21,7 @@ apply_to : (
 apply_to model =
    (
       (Struct.Model.full_debug_reset model),
-      (case (Comm.LoadBattlemap.try model) of
+      (case (Comm.LoadBattle.try model) of
          (Just cmd) -> cmd
          Nothing -> Cmd.none
       )
diff --git a/src/battlemap/src/Update/SetRequestedHelp.elm b/src/battle/src/Update/SetRequestedHelp.elm
index 8f76e3b..dfc58db 100644
--- a/src/battlemap/src/Update/SetRequestedHelp.elm
+++ b/src/battle/src/Update/SetRequestedHelp.elm
@@ -1,7 +1,7 @@
 module Update.SetRequestedHelp exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.HelpRequest
 import Struct.Model
diff --git a/src/battlemap/src/Update/SwitchTeam.elm b/src/battle/src/Update/SwitchTeam.elm
index d9c9879..4e415be 100644
--- a/src/battlemap/src/Update/SwitchTeam.elm
+++ b/src/battle/src/Update/SwitchTeam.elm
@@ -1,7 +1,7 @@
 module Update.SwitchTeam exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 
diff --git a/src/battlemap/src/Update/SwitchWeapon.elm b/src/battle/src/Update/SwitchWeapon.elm
index df45f50..d9375dd 100644
--- a/src/battlemap/src/Update/SwitchWeapon.elm
+++ b/src/battle/src/Update/SwitchWeapon.elm
@@ -2,8 +2,8 @@ module Update.SwitchWeapon exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 import Array
 
--- Battlemap -------------------------------------------------------------------
-import Struct.Battlemap
+-- Map -------------------------------------------------------------------
+import Struct.Map
 import Struct.Character
 import Struct.CharacterTurn
 import Struct.Error
@@ -45,8 +45,8 @@ make_it_so model =
                            (Struct.Weapon.get_defense_range
                               (Struct.WeaponSet.get_active_weapon new_weapons)
                            )
-                           (Struct.Battlemap.get_movement_cost_function
-                              model.battlemap
+                           (Struct.Map.get_movement_cost_function
+                              model.map
                               (Struct.Character.get_location new_char)
                               (Array.toList model.characters)
                            )
diff --git a/src/battlemap/src/Update/TestAnimation.elm b/src/battle/src/Update/TestAnimation.elm
index 8fa16e7..e23d577 100644
--- a/src/battlemap/src/Update/TestAnimation.elm
+++ b/src/battle/src/Update/TestAnimation.elm
@@ -5,7 +5,7 @@ import Delay
 
 import Time
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 
diff --git a/src/battlemap/src/Util/Array.elm b/src/battle/src/Util/Array.elm
index 9e57c18..9e57c18 100644
--- a/src/battlemap/src/Util/Array.elm
+++ b/src/battle/src/Util/Array.elm
diff --git a/src/battlemap/src/Util/Html.elm b/src/battle/src/Util/Html.elm
index 42eadba..42eadba 100644
--- a/src/battlemap/src/Util/Html.elm
+++ b/src/battle/src/Util/Html.elm
diff --git a/src/battlemap/src/Util/List.elm b/src/battle/src/Util/List.elm
index 2bc5217..2bc5217 100644
--- a/src/battlemap/src/Util/List.elm
+++ b/src/battle/src/Util/List.elm
diff --git a/src/battlemap/src/View/Character.elm b/src/battle/src/View/Character.elm
index 838aac4..d33feb1 100644
--- a/src/battlemap/src/View/Character.elm
+++ b/src/battle/src/View/Character.elm
@@ -9,7 +9,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap  ------------------------------------------------------------------
+-- Map  ------------------------------------------------------------------
 import Constants.UI
 
 import Util.Html
@@ -31,9 +31,9 @@ get_activation_level_class : (
 get_activation_level_class char =
    if (Struct.Character.is_enabled char)
    then
-      (Html.Attributes.class "battlemap-character-icon-enabled")
+      (Html.Attributes.class "battle-character-icon-enabled")
    else
-      (Html.Attributes.class "battlemap-character-icon-disabled")
+      (Html.Attributes.class "battle-character-icon-disabled")
 
 get_alliance_class : (
       Struct.Model.Type ->
@@ -43,9 +43,9 @@ get_alliance_class : (
 get_alliance_class model char =
    if ((Struct.Character.get_player_ix char) == model.player_ix)
    then
-      (Html.Attributes.class "battlemap-character-ally")
+      (Html.Attributes.class "battle-character-ally")
    else
-      (Html.Attributes.class "battlemap-character-enemy")
+      (Html.Attributes.class "battle-character-enemy")
 
 get_position_style : (
       Struct.Character.Type ->
@@ -73,7 +73,7 @@ get_focus_class model char =
       (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char)))
    )
    then
-      (Html.Attributes.class "battlemap-character-selected")
+      (Html.Attributes.class "battle-character-selected")
    else
       if
       (
@@ -82,7 +82,7 @@ get_focus_class model char =
          (Just (Struct.Character.get_index char))
       )
       then
-         (Html.Attributes.class "battlemap-character-targeted")
+         (Html.Attributes.class "battle-character-targeted")
       else
          (Html.Attributes.class "")
 
@@ -90,7 +90,7 @@ get_icon_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-icon-body"),
+         (Html.Attributes.class "battle-character-icon-body"),
          (Html.Attributes.class
             (
                "asset-character-team-body-"
@@ -106,7 +106,7 @@ get_icon_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_icon_head_html char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-icon-head"),
+         (Html.Attributes.class "battle-character-icon-head"),
          (Html.Attributes.class
             ("asset-character-icon-" ++ (Struct.Character.get_icon_id char))
          )
@@ -123,8 +123,8 @@ get_icon_actual_html : (
 get_icon_actual_html model char =
       (Html.div
          [
-            (Html.Attributes.class "battlemap-tiled"),
-            (Html.Attributes.class "battlemap-character-icon"),
+            (Html.Attributes.class "battle-tiled"),
+            (Html.Attributes.class "battle-character-icon"),
             (get_activation_level_class char),
             (get_alliance_class model char),
             (get_position_style char),
@@ -144,7 +144,7 @@ get_portrait_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-portrait-body"),
+         (Html.Attributes.class "battle-character-portrait-body"),
          (Html.Attributes.class
             (
                "asset-character-portrait-"
@@ -160,7 +160,7 @@ get_portrait_armor_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_portrait_armor_html char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-portrait-armor"),
+         (Html.Attributes.class "battle-character-portrait-armor"),
          (Html.Attributes.class
             (
                "asset-armor-"
@@ -194,15 +194,15 @@ get_portrait_html viewer_ix char =
             (
                if ((Struct.Character.get_player_ix char) == viewer_ix)
                then
-                  "battlemap-character-ally"
+                  "battle-character-ally"
                else
-                  "battlemap-character-enemy"
+                  "battle-character-enemy"
             )
          ),
-         (Html.Attributes.class "battlemap-character-portrait"),
+         (Html.Attributes.class "battle-character-portrait"),
          (Html.Attributes.class
             (
-               "battlemap-character-portrait-team-"
+               "battle-character-portrait-team-"
                ++
                (toString (Struct.Character.get_player_ix char))
             )
diff --git a/src/battlemap/src/View/Controlled.elm b/src/battle/src/View/Controlled.elm
index 8a36fb8..e0e20bf 100644
--- a/src/battlemap/src/View/Controlled.elm
+++ b/src/battle/src/View/Controlled.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Event
 import Struct.Navigator
@@ -52,7 +52,7 @@ end_turn_button suffix =
    (Html.button
       [
          (Html.Events.onClick Struct.Event.TurnEnded),
-         (Html.Attributes.class "battlemap-end-turn-button")
+         (Html.Attributes.class "battle-end-turn-button")
       ]
       [ (Html.text ("End Turn" ++ suffix)) ]
    )
@@ -104,7 +104,7 @@ get_html char_turn player_ix =
    of
       (Just char) ->
          (Html.div
-            [(Html.Attributes.class "battlemap-controlled")]
+            [(Html.Attributes.class "battle-controlled")]
             [
                (View.Controlled.CharacterCard.get_summary_html
                   char_turn
@@ -124,7 +124,7 @@ get_html char_turn player_ix =
                      (Util.Html.nothing)
                ),
                (Html.div
-                  [(Html.Attributes.class "battlemap-controlled-actions")]
+                  [(Html.Attributes.class "battle-controlled-actions")]
                   (get_available_actions char_turn)
                )
             ]
diff --git a/src/battlemap/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm
index 5d2ad68..b53ae57 100644
--- a/src/battlemap/src/View/Controlled/CharacterCard.elm
+++ b/src/battle/src/View/Controlled/CharacterCard.elm
@@ -10,7 +10,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Armor
 import Struct.Attributes
 import Struct.Character
@@ -37,7 +37,7 @@ get_name : (
 get_name char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-name")
+         (Html.Attributes.class "battle-character-card-name")
       ]
       [
          (Html.text (Struct.Character.get_name char))
@@ -59,7 +59,7 @@ get_health_bar char =
       (View.Gauge.get_html
          ("HP: " ++ (toString current) ++ "/" ++ (toString max))
          (100.0 * ((toFloat current)/(toFloat max)))
-         [(Html.Attributes.class "battlemap-character-card-health")]
+         [(Html.Attributes.class "battle-character-card-health")]
          []
          []
       )
@@ -71,7 +71,7 @@ get_rank_status : (
 get_rank_status rank =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-status"),
+         (Html.Attributes.class "battle-character-card-status"),
          (Html.Attributes.class "clickable"),
          (Html.Events.onClick
             (Struct.Event.RequestedHelp (Struct.HelpRequest.HelpOnRank rank))
@@ -80,10 +80,10 @@ get_rank_status rank =
             (
                case rank of
                   Struct.Character.Commander ->
-                     "battlemap-character-card-commander-status"
+                     "battle-character-card-commander-status"
 
                   Struct.Character.Target ->
-                     "battlemap-character-card-target-status"
+                     "battle-character-card-target-status"
 
                   Struct.Character.Optional -> ""
             )
@@ -100,7 +100,7 @@ get_statuses : (
 get_statuses char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-statuses")
+         (Html.Attributes.class "battle-character-card-statuses")
       ]
       [
          (
@@ -133,7 +133,7 @@ get_active_movement_bar maybe_navigator char =
       (View.Gauge.get_html
          ("MP: " ++ (toString current) ++ "/" ++ (toString max))
          (100.0 * ((toFloat current)/(toFloat max)))
-         [(Html.Attributes.class "battlemap-character-card-movement")]
+         [(Html.Attributes.class "battle-character-card-movement")]
          []
          []
       )
@@ -160,7 +160,7 @@ get_inactive_movement_bar char =
             )
          )
          100.0
-         [(Html.Attributes.class "battlemap-character-card-movement")]
+         [(Html.Attributes.class "battle-character-card-movement")]
          []
          []
       )
@@ -198,12 +198,12 @@ get_weapon_details : (
 get_weapon_details stats weapon =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-weapon")
+         (Html.Attributes.class "battle-character-card-weapon")
       ]
       [
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-weapon-name")
+               (Html.Attributes.class "battle-character-card-weapon-name")
             ]
             [
                (Html.text (Struct.Weapon.get_name weapon))
@@ -211,7 +211,7 @@ get_weapon_details stats weapon =
          ),
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-weapon-name")
+               (Html.Attributes.class "battle-character-card-weapon-name")
             ]
             [
                (Html.text
@@ -246,12 +246,12 @@ get_weapon_summary : (
 get_weapon_summary weapon =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-weapon-summary")
+         (Html.Attributes.class "battle-character-card-weapon-summary")
       ]
       [
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-weapon-name")
+               (Html.Attributes.class "battle-character-card-weapon-name")
             ]
             [
                (Html.text (Struct.Weapon.get_name weapon))
@@ -259,7 +259,7 @@ get_weapon_summary weapon =
          ),
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-weapon-name")
+               (Html.Attributes.class "battle-character-card-weapon-name")
             ]
             [
                (Html.text
@@ -288,12 +288,12 @@ get_armor_details : (
 get_armor_details armor =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-armor")
+         (Html.Attributes.class "battle-character-card-armor")
       ]
       [
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-armor-name")
+               (Html.Attributes.class "battle-character-card-armor-name")
             ]
             [
                (Html.text (Struct.Armor.get_name armor))
@@ -301,7 +301,7 @@ get_armor_details armor =
          ),
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-armor-stats")
+               (Html.Attributes.class "battle-character-card-armor-stats")
             ]
             [
                (stat_name "Slash"),
@@ -328,7 +328,7 @@ stat_name  : String -> (Html.Html Struct.Event.Type)
 stat_name name =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-stat-name")
+         (Html.Attributes.class "battle-character-card-stat-name")
       ]
       [
          (Html.text name)
@@ -339,7 +339,7 @@ stat_val : Int -> Bool -> (Html.Html Struct.Event.Type)
 stat_val val perc =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card-stat-val")
+         (Html.Attributes.class "battle-character-card-stat-val")
       ]
       [
          (Html.text
@@ -365,7 +365,7 @@ att_dual_val base active =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-character-card-att-dual-val")
+            (Html.Attributes.class "battle-character-card-att-dual-val")
          ]
          [
             (Html.text
@@ -401,7 +401,7 @@ get_relevant_stats char weapon =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-character-card-stats")
+            (Html.Attributes.class "battle-character-card-stats")
          ]
          [
             (stat_name "Dodge"),
@@ -440,7 +440,7 @@ get_attributes char weapon armor =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-character-card-stats")
+            (Html.Attributes.class "battle-character-card-stats")
          ]
          [
             (stat_name "Con"),
@@ -487,14 +487,14 @@ get_minimal_html : (
 get_minimal_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-card"),
-         (Html.Attributes.class "battlemap-character-card-minimal")
+         (Html.Attributes.class "battle-character-card"),
+         (Html.Attributes.class "battle-character-card-minimal")
       ]
       [
          (get_name char),
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-card-top")
+               (Html.Attributes.class "battle-character-card-top")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -521,13 +521,13 @@ get_summary_html char_turn player_ix char =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-character-card")
+            (Html.Attributes.class "battle-character-card")
          ]
          [
             (get_name char),
             (Html.div
                [
-                  (Html.Attributes.class "battlemap-character-card-top")
+                  (Html.Attributes.class "battle-character-card-top")
                ]
                [
                   (View.Character.get_portrait_html player_ix char),
@@ -558,13 +558,13 @@ get_full_html player_ix char =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-character-card")
+            (Html.Attributes.class "battle-character-card")
          ]
          [
             (get_name char),
             (Html.div
                [
-                  (Html.Attributes.class "battlemap-character-card-top")
+                  (Html.Attributes.class "battle-character-card-top")
                ]
                [
                   (View.Character.get_portrait_html player_ix char),
diff --git a/src/battlemap/src/View/Controlled/ManualControls.elm b/src/battle/src/View/Controlled/ManualControls.elm
index 4e41e27..1dceafb 100644
--- a/src/battlemap/src/View/Controlled/ManualControls.elm
+++ b/src/battle/src/View/Controlled/ManualControls.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Direction
 import Struct.Event
 
@@ -20,7 +20,7 @@ direction_button : (
 direction_button dir label =
    (Html.div
       [
-         (Html.Attributes.class ("battlemap-manual-controls-" ++ label)),
+         (Html.Attributes.class ("battle-manual-controls-" ++ label)),
          (Html.Attributes.class "clickable"),
          (Html.Events.onClick
             (Struct.Event.DirectionRequested dir)
@@ -33,7 +33,7 @@ go_button : (Html.Html Struct.Event.Type)
 go_button =
    (Html.button
       [
-         (Html.Attributes.class "battlemap-manual-controls-go"),
+         (Html.Attributes.class "battle-manual-controls-go"),
          (Html.Events.onClick Struct.Event.AttackWithoutMovingRequest)
       ]
       [
@@ -48,7 +48,7 @@ get_html : (Html.Html Struct.Event.Type)
 get_html =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-manual-controls")
+         (Html.Attributes.class "battle-manual-controls")
       ]
       [
          (direction_button Struct.Direction.Left "left"),
diff --git a/src/battlemap/src/View/Controlled/Targets.elm b/src/battle/src/View/Controlled/Targets.elm
index 5a7c605..eee5a54 100644
--- a/src/battlemap/src/View/Controlled/Targets.elm
+++ b/src/battle/src/View/Controlled/Targets.elm
@@ -6,7 +6,7 @@ import Dict
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Event
 import Struct.Model
@@ -63,7 +63,7 @@ get_html : (
 get_html model target_ref =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-side-bar-targets")
+         (Html.Attributes.class "battle-side-bar-targets")
       ]
       [(get_target_info_html model target_ref)]
    )
diff --git a/src/battlemap/src/View/Gauge.elm b/src/battle/src/View/Gauge.elm
index a4c5974..cf89f3a 100644
--- a/src/battlemap/src/View/Gauge.elm
+++ b/src/battle/src/View/Gauge.elm
@@ -4,7 +4,7 @@ module View.Gauge exposing (get_html)
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 
 --------------------------------------------------------------------------------
@@ -18,7 +18,7 @@ get_text_div: (
 get_text_div text extra_txt_attr =
    (Html.div
       (
-         [(Html.Attributes.class "battlemap-gauge-text")]
+         [(Html.Attributes.class "battle-gauge-text")]
          ++ extra_txt_attr
       )
       [
@@ -41,7 +41,7 @@ get_bar_div percent extra_bar_attr =
                ]
             ),
             (Html.Attributes.class
-               "battlemap-gauge-bar"
+               "battle-gauge-bar"
             )
          ]
          ++
@@ -66,7 +66,7 @@ get_html : (
 get_html text percent extra_div_attr extra_bar_attr extra_txt_attr =
    (Html.div
       (
-         [(Html.Attributes.class "battlemap-gauge")]
+         [(Html.Attributes.class "battle-gauge")]
          ++ extra_div_attr
       )
       [
diff --git a/src/battlemap/src/View/MainMenu.elm b/src/battle/src/View/MainMenu.elm
index f301ea6..9f3099b 100644
--- a/src/battlemap/src/View/MainMenu.elm
+++ b/src/battle/src/View/MainMenu.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.UI
 
@@ -29,7 +29,7 @@ get_html : (Html.Html Struct.Event.Type)
 get_html =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-main-menu")
+         (Html.Attributes.class "battle-main-menu")
       ]
       (List.map
          (get_menu_button_html)
diff --git a/src/battlemap/src/View/Battlemap.elm b/src/battle/src/View/Map.elm
index c185486..ad10695 100644
--- a/src/battlemap/src/View/Battlemap.elm
+++ b/src/battle/src/View/Map.elm
@@ -1,4 +1,4 @@
-module View.Battlemap exposing (get_html)
+module View.Map exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Array
@@ -9,10 +9,10 @@ import Html.Lazy
 
 import List
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.UI
 
-import Struct.Battlemap
+import Struct.Map
 import Struct.Character
 import Struct.Event
 import Struct.Model
@@ -21,18 +21,18 @@ import Struct.UI
 
 import Util.Html
 
-import View.Battlemap.Character
-import View.Battlemap.Navigator
-import View.Battlemap.Tile
+import View.Map.Character
+import View.Map.Navigator
+import View.Map.Tile
 
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-get_tiles_html : Struct.Battlemap.Type -> (Html.Html Struct.Event.Type)
-get_tiles_html battlemap =
+get_tiles_html : Struct.Map.Type -> (Html.Html Struct.Event.Type)
+get_tiles_html map =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-tiles-layer"),
+         (Html.Attributes.class "battle-tiles-layer"),
          (Html.Attributes.style
             [
                (
@@ -40,7 +40,7 @@ get_tiles_html battlemap =
                   (
                      (toString
                         (
-                           (Struct.Battlemap.get_width battlemap)
+                           (Struct.Map.get_width map)
                            * Constants.UI.tile_size
                         )
                      )
@@ -52,7 +52,7 @@ get_tiles_html battlemap =
                   (
                      (toString
                         (
-                           (Struct.Battlemap.get_height battlemap)
+                           (Struct.Map.get_height map)
                            * Constants.UI.tile_size
                         )
                      )
@@ -63,8 +63,8 @@ get_tiles_html battlemap =
          )
       ]
       (List.map
-         (View.Battlemap.Tile.get_html)
-         (Array.toList (Struct.Battlemap.get_tiles battlemap))
+         (View.Map.Tile.get_html)
+         (Array.toList (Struct.Map.get_tiles map))
       )
    )
 
@@ -86,9 +86,9 @@ maybe_print_navigator interactive maybe_nav =
          (Just nav) ->
             (Html.div
                [
-                  (Html.Attributes.class ("battlemap-navigator" ++ name_suffix))
+                  (Html.Attributes.class ("battle-navigator" ++ name_suffix))
                ]
-               (View.Battlemap.Navigator.get_html
+               (View.Map.Navigator.get_html
                   (Struct.Navigator.get_summary nav)
                   interactive
                )
@@ -105,10 +105,10 @@ get_characters_html : (
 get_characters_html model characters =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-characters")
+         (Html.Attributes.class "battle-characters")
       ]
       (List.map
-         (View.Battlemap.Character.get_html model)
+         (View.Map.Character.get_html model)
          (Array.toList model.characters)
       )
    )
@@ -123,7 +123,7 @@ get_html : (
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-actual"),
+         (Html.Attributes.class "battle-actual"),
          (Html.Attributes.style
             (
                if ((Struct.UI.get_zoom_level model.ui) == 1)
@@ -144,7 +144,7 @@ get_html model =
          )
       ]
       [
-         (Html.Lazy.lazy (get_tiles_html) model.battlemap),
+         (Html.Lazy.lazy (get_tiles_html) model.map),
          -- Not in lazy mode, because I can't easily get rid of that 'model'
          -- parameter.
          (get_characters_html model model.characters),
diff --git a/src/battlemap/src/View/Battlemap/Character.elm b/src/battle/src/View/Map/Character.elm
index fa1bdc1..aaf7cb2 100644
--- a/src/battlemap/src/View/Battlemap/Character.elm
+++ b/src/battle/src/View/Map/Character.elm
@@ -1,11 +1,11 @@
-module View.Battlemap.Character exposing (get_html)
+module View.Map.Character exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap  ------------------------------------------------------------------
+-- Map  ------------------------------------------------------------------
 import Constants.UI
 
 import Util.Html
@@ -36,7 +36,7 @@ get_animation_class model char =
                then
                   (Html.Attributes.class "")
                else
-                  (Html.Attributes.class "battlemap-character-selected")
+                  (Html.Attributes.class "battle-character-selected")
 
             (Struct.TurnResultAnimator.TurnResult current_action) ->
                if
@@ -51,7 +51,7 @@ get_animation_class model char =
                   case current_action of
                      (Struct.TurnResult.Moved _) ->
                         (Html.Attributes.class
-                           "battlemap-animated-character-icon"
+                           "battle-animated-character-icon"
                         )
 
                      _ -> (Html.Attributes.class "")
@@ -64,9 +64,9 @@ get_activation_level_class : (
 get_activation_level_class char =
    if (Struct.Character.is_enabled char)
    then
-      (Html.Attributes.class "battlemap-character-icon-enabled")
+      (Html.Attributes.class "battle-character-icon-enabled")
    else
-      (Html.Attributes.class "battlemap-character-icon-disabled")
+      (Html.Attributes.class "battle-character-icon-disabled")
 
 get_alliance_class : (
       Struct.Model.Type ->
@@ -76,9 +76,9 @@ get_alliance_class : (
 get_alliance_class model char =
    if ((Struct.Character.get_player_ix char) == model.player_ix)
    then
-      (Html.Attributes.class "battlemap-character-ally")
+      (Html.Attributes.class "battle-character-ally")
    else
-      (Html.Attributes.class "battlemap-character-enemy")
+      (Html.Attributes.class "battle-character-enemy")
 
 get_position_style : (
       Struct.Character.Type ->
@@ -106,7 +106,7 @@ get_focus_class model char =
       (Just (Struct.UI.SelectedCharacter (Struct.Character.get_index char)))
    )
    then
-      (Html.Attributes.class "battlemap-character-selected")
+      (Html.Attributes.class "battle-character-selected")
    else
       if
       (
@@ -115,7 +115,7 @@ get_focus_class model char =
          (Just (Struct.Character.get_index char))
       )
       then
-         (Html.Attributes.class "battlemap-character-targeted")
+         (Html.Attributes.class "battle-character-targeted")
       else
          (Html.Attributes.class "")
 
@@ -123,7 +123,7 @@ get_body_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_body_html char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-icon-body"),
+         (Html.Attributes.class "battle-character-icon-body"),
          (Html.Attributes.class
             (
                "asset-character-team-body-"
@@ -139,7 +139,7 @@ get_head_html : Struct.Character.Type -> (Html.Html Struct.Event.Type)
 get_head_html char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-character-icon-head"),
+         (Html.Attributes.class "battle-character-icon-head"),
          (Html.Attributes.class
             ("asset-character-icon-" ++ (Struct.Character.get_icon_id char))
          )
@@ -154,7 +154,7 @@ get_banner_html char =
       Struct.Character.Commander ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-icon-banner"),
+               (Html.Attributes.class "battle-character-icon-banner"),
                (Html.Attributes.class "asset-character-icon-commander-banner")
             ]
             [
@@ -164,7 +164,7 @@ get_banner_html char =
       Struct.Character.Target ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-character-icon-banner"),
+               (Html.Attributes.class "battle-character-icon-banner"),
                (Html.Attributes.class "asset-character-icon-target-banner")
             ]
             [
@@ -181,8 +181,8 @@ get_actual_html : (
 get_actual_html model char =
       (Html.div
          [
-            (Html.Attributes.class "battlemap-tiled"),
-            (Html.Attributes.class "battlemap-character-icon"),
+            (Html.Attributes.class "battle-tiled"),
+            (Html.Attributes.class "battle-character-icon"),
             (get_animation_class model char),
             (get_activation_level_class char),
             (get_alliance_class model char),
diff --git a/src/battlemap/src/View/Battlemap/Navigator.elm b/src/battle/src/View/Map/Navigator.elm
index a03e7d0..63c982a 100644
--- a/src/battlemap/src/View/Battlemap/Navigator.elm
+++ b/src/battle/src/View/Map/Navigator.elm
@@ -1,4 +1,4 @@
-module View.Battlemap.Navigator exposing (get_html)
+module View.Map.Navigator exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Html
@@ -7,7 +7,7 @@ import Html.Events
 
 import List
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.UI
 
 import Struct.Direction
@@ -28,11 +28,11 @@ marker_get_html is_interactive (loc_ref, marker) =
    (Html.div
       (
          [
-            (Html.Attributes.class "battlemap-marker-icon"),
-            (Html.Attributes.class "battlemap-tiled"),
+            (Html.Attributes.class "battle-marker-icon"),
+            (Html.Attributes.class "battle-tiled"),
             (Html.Attributes.class
                (
-                  "battlemap-"
+                  "battle-"
                   ++
                   (
                      case marker of
@@ -79,7 +79,7 @@ marker_get_html is_interactive (loc_ref, marker) =
                )
                then
                   [
-                     (Html.Attributes.class "battlemap-navigator-interactive"),
+                     (Html.Attributes.class "battle-navigator-interactive"),
                      (Html.Attributes.class "clickable"),
                      (Html.Events.onClick
                         (Struct.Event.CharacterOrTileSelected loc_ref)
@@ -87,11 +87,11 @@ marker_get_html is_interactive (loc_ref, marker) =
                   ]
                else
                   [
-                     (Html.Attributes.class "battlemap-navigator-interactive")
+                     (Html.Attributes.class "battle-navigator-interactive")
                   ]
             else
                [
-                  (Html.Attributes.class "battlemap-navigator-non-interactive"),
+                  (Html.Attributes.class "battle-navigator-non-interactive"),
                   (Html.Events.onClick
                      (Struct.Event.CharacterOrTileSelected loc_ref)
                   )
@@ -123,20 +123,20 @@ path_node_get_html is_below_markers next_dir (curr_loc, curr_dir, curr_nodes) =
       (
          (Html.div
             [
-               (Html.Attributes.class "battlemap-path-icon"),
+               (Html.Attributes.class "battle-path-icon"),
                (Html.Attributes.class
                   (
                      if (is_below_markers)
                      then
-                        "battlemap-path-icon-below-markers"
+                        "battle-path-icon-below-markers"
                      else
-                        "battlemap-path-icon-above-markers"
+                        "battle-path-icon-above-markers"
                   )
                ),
-               (Html.Attributes.class "battlemap-tiled"),
+               (Html.Attributes.class "battle-tiled"),
                (Html.Attributes.class
                   (
-                     "battlemap-path-icon-"
+                     "battle-path-icon-"
                      ++
                      (Struct.Direction.to_string curr_dir)
                      ++
@@ -185,12 +185,12 @@ mark_the_spot : (
 mark_the_spot loc origin_dir =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-path-icon"),
-         (Html.Attributes.class "battlemap-path-icon-above-markers"),
-         (Html.Attributes.class "battlemap-tiled"),
+         (Html.Attributes.class "battle-path-icon"),
+         (Html.Attributes.class "battle-path-icon-above-markers"),
+         (Html.Attributes.class "battle-tiled"),
          (Html.Attributes.class
             (
-               "battlemap-path-icon-mark"
+               "battle-path-icon-mark"
                ++
                (Struct.Direction.to_string origin_dir)
             )
diff --git a/src/battlemap/src/View/Battlemap/Tile.elm b/src/battle/src/View/Map/Tile.elm
index a049acf..600e26d 100644
--- a/src/battlemap/src/View/Battlemap/Tile.elm
+++ b/src/battle/src/View/Map/Tile.elm
@@ -1,11 +1,11 @@
-module View.Battlemap.Tile exposing (get_html)
+module View.Map.Tile exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
 import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Constants.UI
 import Constants.IO
 
@@ -30,11 +30,11 @@ get_html tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-tile-icon"),
-            (Html.Attributes.class "battlemap-tiled"),
+            (Html.Attributes.class "battle-tile-icon"),
+            (Html.Attributes.class "battle-tiled"),
             (Html.Attributes.class
                (
-                  "battlemap-tile-variant-"
+                  "battle-tile-variant-"
                   ++ (toString (Struct.Tile.get_variant_id tile))
                )
             ),
diff --git a/src/battlemap/src/View/MessageBoard.elm b/src/battle/src/View/MessageBoard.elm
index 5de6e8d..736f938 100644
--- a/src/battlemap/src/View/MessageBoard.elm
+++ b/src/battle/src/View/MessageBoard.elm
@@ -3,7 +3,7 @@ module View.MessageBoard exposing (get_html)
 -- Elm -------------------------------------------------------------------------
 import Html
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.Model
 
diff --git a/src/battlemap/src/View/MessageBoard/Animator.elm b/src/battle/src/View/MessageBoard/Animator.elm
index 5c8938b..49bb83a 100644
--- a/src/battlemap/src/View/MessageBoard/Animator.elm
+++ b/src/battle/src/View/MessageBoard/Animator.elm
@@ -3,7 +3,7 @@ module View.MessageBoard.Animator exposing (get_html)
 -- Elm -------------------------------------------------------------------------
 import Html
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.Model
 import Struct.TurnResult
diff --git a/src/battlemap/src/View/MessageBoard/Animator/Attack.elm b/src/battle/src/View/MessageBoard/Animator/Attack.elm
index 211ada4..437a76d 100644
--- a/src/battlemap/src/View/MessageBoard/Animator/Attack.elm
+++ b/src/battle/src/View/MessageBoard/Animator/Attack.elm
@@ -6,7 +6,7 @@ import Array
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Attack
 import Struct.Character
 import Struct.Event
@@ -47,7 +47,7 @@ get_empty_attack_html : (Html.Html Struct.Event.Type)
 get_empty_attack_html =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-message-attack-text")
+         (Html.Attributes.class "battle-message-attack-text")
       ]
       []
    )
@@ -65,7 +65,7 @@ get_attack_html attacker defender attack =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-message-attack-text")
+            (Html.Attributes.class "battle-message-attack-text")
          ]
          [
             (Html.text
@@ -111,9 +111,9 @@ get_attack_animation_class : (
 get_attack_animation_class attack char =
    if (attack.critical)
    then
-      "battlemap-animated-portrait-attack-critical"
+      "battle-animated-portrait-attack-critical"
    else
-      "battlemap-animated-portrait-attacks"
+      "battle-animated-portrait-attacks"
 
 get_defense_animation_class : (
       Struct.Attack.Type ->
@@ -125,22 +125,22 @@ get_defense_animation_class attack char =
    then
       if (attack.precision == Struct.Attack.Miss)
       then
-         "battlemap-animated-portrait-dodges"
+         "battle-animated-portrait-dodges"
       else
-         "battlemap-animated-portrait-undamaged"
+         "battle-animated-portrait-undamaged"
    else if ((Struct.Character.get_current_health char) > 0)
    then
       if (attack.precision == Struct.Attack.Graze)
       then
-         "battlemap-animated-portrait-grazed-damage"
+         "battle-animated-portrait-grazed-damage"
       else
-         "battlemap-animated-portrait-damaged"
+         "battle-animated-portrait-damaged"
    else
       if (attack.precision == Struct.Attack.Graze)
       then
-         "battlemap-animated-portrait-grazed-death"
+         "battle-animated-portrait-grazed-death"
       else
-         "battlemap-animated-portrait-dies"
+         "battle-animated-portrait-dies"
 
 get_attacker_card : (
       (Maybe Struct.Attack.Type) ->
@@ -154,12 +154,12 @@ get_attacker_card maybe_attack char =
             if ((Struct.Character.get_current_health char) > 0)
             then
                [
-                  (Html.Attributes.class "battlemap-animated-portrait")
+                  (Html.Attributes.class "battle-animated-portrait")
                ]
             else
                [
-                  (Html.Attributes.class "battlemap-animated-portrait-absent"),
-                  (Html.Attributes.class "battlemap-animated-portrait")
+                  (Html.Attributes.class "battle-animated-portrait-absent"),
+                  (Html.Attributes.class "battle-animated-portrait")
                ]
 
          (Just attack) ->
@@ -179,7 +179,7 @@ get_attacker_card maybe_attack char =
                         (get_attack_animation_class attack char)
                   )
                ),
-               (Html.Attributes.class "battlemap-animated-portrait")
+               (Html.Attributes.class "battle-animated-portrait")
             ]
       )
       [
@@ -202,12 +202,12 @@ get_defender_card maybe_attack char =
             if ((Struct.Character.get_current_health char) > 0)
             then
                [
-                  (Html.Attributes.class "battlemap-animated-portrait")
+                  (Html.Attributes.class "battle-animated-portrait")
                ]
             else
                [
-                  (Html.Attributes.class "battlemap-animated-portrait-absent"),
-                  (Html.Attributes.class "battlemap-animated-portrait")
+                  (Html.Attributes.class "battle-animated-portrait-absent"),
+                  (Html.Attributes.class "battle-animated-portrait")
                ]
 
          (Just attack) ->
@@ -227,7 +227,7 @@ get_defender_card maybe_attack char =
                         (get_defense_animation_class attack char)
                   )
                ),
-               (Html.Attributes.class "battlemap-animated-portrait")
+               (Html.Attributes.class "battle-animated-portrait")
             ]
       )
       [
@@ -255,8 +255,8 @@ get_placeholder_html characters attacker_ix defender_ix maybe_attack =
       ((Just atkchar), (Just defchar)) ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-message-board"),
-               (Html.Attributes.class "battlemap-message-attack")
+               (Html.Attributes.class "battle-message-board"),
+               (Html.Attributes.class "battle-message-attack")
             ]
             (
                [
diff --git a/src/battlemap/src/View/MessageBoard/Error.elm b/src/battle/src/View/MessageBoard/Error.elm
index 642634a..797d89f 100644
--- a/src/battlemap/src/View/MessageBoard/Error.elm
+++ b/src/battle/src/View/MessageBoard/Error.elm
@@ -4,7 +4,7 @@ module View.MessageBoard.Error exposing (get_html)
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Error
 import Struct.Event
 import Struct.Model
@@ -24,8 +24,8 @@ get_html : (
 get_html model error =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-message-board"),
-         (Html.Attributes.class "battlemap-error")
+         (Html.Attributes.class "battle-message-board"),
+         (Html.Attributes.class "battle-error")
       ]
       [
          (Html.text (Struct.Error.to_string error))
diff --git a/src/battlemap/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm
index 15a33a5..6c20bbc 100644
--- a/src/battlemap/src/View/MessageBoard/Help.elm
+++ b/src/battle/src/View/MessageBoard/Help.elm
@@ -4,7 +4,7 @@ module View.MessageBoard.Help exposing (get_html)
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.HelpRequest
 import Struct.Model
@@ -23,8 +23,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-message-board"),
-         (Html.Attributes.class "battlemap-message-board-help")
+         (Html.Attributes.class "battle-message-board"),
+         (Html.Attributes.class "battle-message-board-help")
       ]
       (
          case model.help_request of
diff --git a/src/battlemap/src/View/MessageBoard/Help/Guide.elm b/src/battle/src/View/MessageBoard/Help/Guide.elm
index a10b96e..0a41e91 100644
--- a/src/battlemap/src/View/MessageBoard/Help/Guide.elm
+++ b/src/battle/src/View/MessageBoard/Help/Guide.elm
@@ -4,7 +4,7 @@ module View.MessageBoard.Help.Guide exposing (get_html_contents)
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Event
 import Struct.Model
@@ -18,7 +18,7 @@ get_header_html title =
       []
       [
          (Html.div
-            [(Html.Attributes.class "battlemap-help-guide-icon")]
+            [(Html.Attributes.class "battle-help-guide-icon")]
             []
          ),
          (Html.text title)
diff --git a/src/battlemap/src/View/MessageBoard/Help/Rank.elm b/src/battle/src/View/MessageBoard/Help/Rank.elm
index 95477d3..4a01e75 100644
--- a/src/battlemap/src/View/MessageBoard/Help/Rank.elm
+++ b/src/battle/src/View/MessageBoard/Help/Rank.elm
@@ -4,7 +4,7 @@ module View.MessageBoard.Help.Rank exposing (get_html_contents)
 import Html
 import Html.Attributes
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Event
 
@@ -14,7 +14,7 @@ import Struct.Event
 get_guide_icon_html : (Html.Html Struct.Event.Type)
 get_guide_icon_html =
    (Html.div
-      [(Html.Attributes.class "battlemap-help-guide-icon")]
+      [(Html.Attributes.class "battle-help-guide-icon")]
       []
    )
 
@@ -28,10 +28,10 @@ get_header_with_icon_html title rank_name =
          (Html.div
             [
                (Html.Attributes.class
-                  "battlemap-message-board-help-figure"
+                  "battle-message-board-help-figure"
                ),
                (Html.Attributes.class
-                  ("battlemap-character-card-" ++ rank_name ++ "-status")
+                  ("battle-character-card-" ++ rank_name ++ "-status")
                )
             ]
             []
diff --git a/src/battlemap/src/View/SubMenu.elm b/src/battle/src/View/SubMenu.elm
index 8537452..e661b9c 100644
--- a/src/battlemap/src/View/SubMenu.elm
+++ b/src/battle/src/View/SubMenu.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 import Html.Lazy
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.CharacterTurn
 import Struct.Event
 import Struct.Model
@@ -56,7 +56,7 @@ get_html model =
    case (Struct.UI.try_getting_displayed_tab model.ui) of
       (Just tab) ->
          (Html.div
-            [(Html.Attributes.class "battlemap-sub-menu")]
+            [(Html.Attributes.class "battle-sub-menu")]
             [(get_inner_html model tab)]
          )
 
@@ -66,7 +66,7 @@ get_html model =
                case (Array.get char_ref model.characters) of
                   (Just char) ->
                      (Html.div
-                        [(Html.Attributes.class "battlemap-sub-menu")]
+                        [(Html.Attributes.class "battle-sub-menu")]
                         [
                            (Html.text "Targeting:"),
                            (Html.Lazy.lazy3
diff --git a/src/battlemap/src/View/SubMenu/Characters.elm b/src/battle/src/View/SubMenu/Characters.elm
index be5bac4..396dbee 100644
--- a/src/battlemap/src/View/SubMenu/Characters.elm
+++ b/src/battle/src/View/SubMenu/Characters.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Event
 
@@ -24,7 +24,7 @@ get_character_element_html : (
 get_character_element_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-characters-element"),
+         (Html.Attributes.class "battle-characters-element"),
          (
             if (Struct.Character.is_alive char)
             then
@@ -38,9 +38,9 @@ get_character_element_html player_ix char =
          (
             if (Struct.Character.is_enabled char)
             then
-               (Html.Attributes.class "battlemap-characters-element-active")
+               (Html.Attributes.class "battle-characters-element-active")
             else
-               (Html.Attributes.class "battlemap-characters-element-inactive")
+               (Html.Attributes.class "battle-characters-element-inactive")
          )
       ]
       [
@@ -59,8 +59,8 @@ get_html : (
 get_html characters player_ix =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-tabmenu-content"),
-         (Html.Attributes.class "battlemap-tabmenu-characters-tab")
+         (Html.Attributes.class "battle-tabmenu-content"),
+         (Html.Attributes.class "battle-tabmenu-characters-tab")
       ]
       (List.map
          (get_character_element_html player_ix)
diff --git a/src/battlemap/src/View/SubMenu/Settings.elm b/src/battle/src/View/SubMenu/Settings.elm
index 22aa99a..e0ad4d7 100644
--- a/src/battlemap/src/View/SubMenu/Settings.elm
+++ b/src/battle/src/View/SubMenu/Settings.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.Model
 
@@ -30,8 +30,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-tabmenu-content"),
-         (Html.Attributes.class "battlemap-tabmenu-settings-tab")
+         (Html.Attributes.class "battle-tabmenu-content"),
+         (Html.Attributes.class "battle-tabmenu-settings-tab")
       ]
       [
          (scale_button (0.75) "Zoom -"),
@@ -45,9 +45,9 @@ get_html model =
          ),
          (Html.button
             [
-               (Html.Events.onClick Struct.Event.DebugLoadBattlemapRequest)
+               (Html.Events.onClick Struct.Event.DebugLoadBattleRequest)
             ]
-            [ (Html.text "[DEBUG] Load battlemap") ]
+            [ (Html.text "[DEBUG] Load map") ]
          ),
          (Html.button
             [
diff --git a/src/battlemap/src/View/SubMenu/Status.elm b/src/battle/src/View/SubMenu/Status.elm
index f67c85e..485704e 100644
--- a/src/battlemap/src/View/SubMenu/Status.elm
+++ b/src/battle/src/View/SubMenu/Status.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 import Html.Lazy
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.Location
 import Struct.Model
@@ -26,8 +26,8 @@ get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-footer-tabmenu-content"),
-         (Html.Attributes.class "battlemap-footer-tabmenu-content-status")
+         (Html.Attributes.class "battle-footer-tabmenu-content"),
+         (Html.Attributes.class "battle-footer-tabmenu-content-status")
       ]
       [
          (case (Struct.UI.get_previous_action model.ui) of
diff --git a/src/battlemap/src/View/SubMenu/Status/CharacterInfo.elm b/src/battle/src/View/SubMenu/Status/CharacterInfo.elm
index a927158..814ce5f 100644
--- a/src/battlemap/src/View/SubMenu/Status/CharacterInfo.elm
+++ b/src/battle/src/View/SubMenu/Status/CharacterInfo.elm
@@ -4,7 +4,7 @@ module View.SubMenu.Status.CharacterInfo exposing (get_html)
 import Html
 import Html.Attributes
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Event
 
@@ -25,7 +25,7 @@ get_html : (
 get_html player_ix char =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-tabmenu-character-info")
+         (Html.Attributes.class "battle-tabmenu-character-info")
       ]
       [
          (Html.text ("Focusing:")),
diff --git a/src/battlemap/src/View/SubMenu/Status/TileInfo.elm b/src/battle/src/View/SubMenu/Status/TileInfo.elm
index a009bc3..7448247 100644
--- a/src/battlemap/src/View/SubMenu/Status/TileInfo.elm
+++ b/src/battle/src/View/SubMenu/Status/TileInfo.elm
@@ -6,11 +6,11 @@ import Dict
 import Html
 import Html.Attributes
 
--- Struct.Battlemap -------------------------------------------------------------------
+-- Struct.Map -------------------------------------------------------------------
 import Constants.IO
 import Constants.Movement
 
-import Struct.Battlemap
+import Struct.Map
 import Struct.Event
 import Struct.Location
 import Struct.Model
@@ -24,10 +24,10 @@ get_icon : (Struct.Tile.Instance -> (Html.Html Struct.Event.Type))
 get_icon tile =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-tile-card-icon"),
+         (Html.Attributes.class "battle-tile-card-icon"),
          (Html.Attributes.class
             (
-               "battlemap-tile-variant-"
+               "battle-tile-variant-"
                ++ (toString (Struct.Tile.get_variant_id tile))
             )
          ),
@@ -60,7 +60,7 @@ get_name model tile =
       (Just tile_type) ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-tile-card-name")
+               (Html.Attributes.class "battle-tile-card-name")
             ]
             [
                (Html.text (Struct.Tile.get_name tile_type))
@@ -80,7 +80,7 @@ get_cost tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-tile-card-cost")
+            (Html.Attributes.class "battle-tile-card-cost")
          ]
          [
             (Html.text text)
@@ -94,7 +94,7 @@ get_location tile =
    in
       (Html.div
          [
-            (Html.Attributes.class "battlemap-tile-card-location")
+            (Html.Attributes.class "battle-tile-card-location")
          ]
          [
             (Html.text
@@ -118,17 +118,17 @@ get_html : (
       (Html.Html Struct.Event.Type)
    )
 get_html model loc =
-   case (Struct.Battlemap.try_getting_tile_at loc model.battlemap) of
+   case (Struct.Map.try_getting_tile_at loc model.map) of
       (Just tile) ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-tile-card")
+               (Html.Attributes.class "battle-tile-card")
             ]
             [
                (get_name model tile),
                (Html.div
                   [
-                     (Html.Attributes.class "battlemap-tile-card-top")
+                     (Html.Attributes.class "battle-tile-card-top")
                   ]
                   [
                      (get_icon tile),
diff --git a/src/battlemap/src/View/SubMenu/Timeline.elm b/src/battle/src/View/SubMenu/Timeline.elm
index e6a449f..7fb1813 100644
--- a/src/battlemap/src/View/SubMenu/Timeline.elm
+++ b/src/battle/src/View/SubMenu/Timeline.elm
@@ -8,7 +8,7 @@ import Html.Attributes
 --import Html.Events
 import Html.Lazy
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Character
 import Struct.Event
 import Struct.TurnResult
@@ -71,8 +71,8 @@ true_get_html : (
 true_get_html characters player_ix turn_results =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-tabmenu-content"),
-         (Html.Attributes.class "battlemap-tabmenu-timeline-tab")
+         (Html.Attributes.class "battle-tabmenu-content"),
+         (Html.Attributes.class "battle-tabmenu-timeline-tab")
       ]
       (Array.toList
          (Array.map
diff --git a/src/battlemap/src/View/SubMenu/Timeline/Attack.elm b/src/battle/src/View/SubMenu/Timeline/Attack.elm
index 875bc89..682540d 100644
--- a/src/battlemap/src/View/SubMenu/Timeline/Attack.elm
+++ b/src/battle/src/View/SubMenu/Timeline/Attack.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 --import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Attack
 import Struct.Event
 import Struct.TurnResult
@@ -26,7 +26,7 @@ get_title_html : (
 get_title_html attacker defender =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-timeline-attack-title")
+         (Html.Attributes.class "battle-timeline-attack-title")
       ]
       [
          (Html.text
@@ -135,8 +135,8 @@ get_html characters player_ix attack =
       ((Just atkchar), (Just defchar)) ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-timeline-element"),
-               (Html.Attributes.class "battlemap-timeline-attack")
+               (Html.Attributes.class "battle-timeline-element"),
+               (Html.Attributes.class "battle-timeline-attack")
             ]
             (
                [
@@ -155,8 +155,8 @@ get_html characters player_ix attack =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-timeline-element"),
-               (Html.Attributes.class "battlemap-timeline-attack")
+               (Html.Attributes.class "battle-timeline-element"),
+               (Html.Attributes.class "battle-timeline-attack")
             ]
             [
                (Html.text "Error: Attack with unknown characters")
diff --git a/src/battlemap/src/View/SubMenu/Timeline/Movement.elm b/src/battle/src/View/SubMenu/Timeline/Movement.elm
index 2f7acd3..0746f1f 100644
--- a/src/battlemap/src/View/SubMenu/Timeline/Movement.elm
+++ b/src/battle/src/View/SubMenu/Timeline/Movement.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 --import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
 import Struct.Character
@@ -32,8 +32,8 @@ get_html characters player_ix movement =
       (Just char) ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-timeline-element"),
-               (Html.Attributes.class "battlemap-timeline-movement")
+               (Html.Attributes.class "battle-timeline-element"),
+               (Html.Attributes.class "battle-timeline-movement")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -53,8 +53,8 @@ get_html characters player_ix movement =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-timeline-element"),
-               (Html.Attributes.class "battlemap-timeline-movement")
+               (Html.Attributes.class "battle-timeline-element"),
+               (Html.Attributes.class "battle-timeline-movement")
             ]
             [
                (Html.text "Error: Moving with unknown character")
diff --git a/src/battlemap/src/View/SubMenu/Timeline/PlayerDefeat.elm b/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm
index 7bbff11..db5e023 100644
--- a/src/battlemap/src/View/SubMenu/Timeline/PlayerDefeat.elm
+++ b/src/battle/src/View/SubMenu/Timeline/PlayerDefeat.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 --import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
 
@@ -23,8 +23,8 @@ get_html : (
 get_html pdefeat =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-timeline-element"),
-         (Html.Attributes.class "battlemap-timeline-player-defeat")
+         (Html.Attributes.class "battle-timeline-element"),
+         (Html.Attributes.class "battle-timeline-player-defeat")
       ]
       [
          (Html.text
diff --git a/src/battlemap/src/View/SubMenu/Timeline/PlayerTurnStart.elm b/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm
index 11f639e..a6486fa 100644
--- a/src/battlemap/src/View/SubMenu/Timeline/PlayerTurnStart.elm
+++ b/src/battle/src/View/SubMenu/Timeline/PlayerTurnStart.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 --import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
 
@@ -23,8 +23,8 @@ get_html : (
 get_html pturns =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-timeline-element"),
-         (Html.Attributes.class "battlemap-timeline-turn-start")
+         (Html.Attributes.class "battle-timeline-element"),
+         (Html.Attributes.class "battle-timeline-turn-start")
       ]
       [
          (Html.text
diff --git a/src/battlemap/src/View/SubMenu/Timeline/PlayerVictory.elm b/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm
index 77494b6..4d47f62 100644
--- a/src/battlemap/src/View/SubMenu/Timeline/PlayerVictory.elm
+++ b/src/battle/src/View/SubMenu/Timeline/PlayerVictory.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 --import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
 
@@ -23,15 +23,15 @@ get_html : (
 get_html pvict =
    (Html.div
       [
-         (Html.Attributes.class "battlemap-timeline-element"),
-         (Html.Attributes.class "battlemap-timeline-player-victory")
+         (Html.Attributes.class "battle-timeline-element"),
+         (Html.Attributes.class "battle-timeline-player-victory")
       ]
       [
          (Html.text
             (
                "Player "
                ++ (toString pvict.player_index)
-               ++ " has won the battle."
+               ++ " has won the map."
             )
          )
       ]
diff --git a/src/battlemap/src/View/SubMenu/Timeline/WeaponSwitch.elm b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
index e66cfed..499e0c3 100644
--- a/src/battlemap/src/View/SubMenu/Timeline/WeaponSwitch.elm
+++ b/src/battle/src/View/SubMenu/Timeline/WeaponSwitch.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 --import Html.Events
 
--- Battlemap -------------------------------------------------------------------
+-- Map -------------------------------------------------------------------
 import Struct.Event
 import Struct.TurnResult
 import Struct.Character
@@ -32,8 +32,8 @@ get_html characters player_ix weapon_switch =
       (Just char) ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-timeline-element"),
-               (Html.Attributes.class "battlemap-timeline-weapon-switch")
+               (Html.Attributes.class "battle-timeline-element"),
+               (Html.Attributes.class "battle-timeline-weapon-switch")
             ]
             [
                (View.Character.get_portrait_html player_ix char),
@@ -49,8 +49,8 @@ get_html characters player_ix weapon_switch =
       _ ->
          (Html.div
             [
-               (Html.Attributes.class "battlemap-timeline-element"),
-               (Html.Attributes.class "battlemap-timeline-weapon-switch")
+               (Html.Attributes.class "battle-timeline-element"),
+               (Html.Attributes.class "battle-timeline-weapon-switch")
             ]
             [
                (Html.text "Error: Unknown character switched weapons")
diff --git a/src/battlemap/www/index.html b/src/battle/www/index.html
index fcba44a..16c2e21 100644
--- a/src/battlemap/www/index.html
+++ b/src/battle/www/index.html
@@ -2,7 +2,7 @@
 <html>
    <head>
       <link rel="stylesheet" type="text/css" href="../global/style.css">
-      <link rel="stylesheet" type="text/css" href="../battlemap/style.css">
+      <link rel="stylesheet" type="text/css" href="../battle/style.css">
       <link rel="stylesheet" type="text/css" href="../asset/characters.css">
       <link rel="stylesheet" type="text/css" href="../asset/armors.css">
       <link rel="icon" type="image/x-icon" href="/favicon.ico">
diff --git a/src/battlemap/www/style.css b/src/battle/www/style.css
index 33ff3db..af30c76 100644
--- a/src/battlemap/www/style.css
+++ b/src/battle/www/style.css
@@ -4,7 +4,7 @@
 .fullscreen-module {}
 
 
-.battlemap-main-menu
+.battle-main-menu
 {
    position: absolute;
    top: 0;
@@ -28,7 +28,7 @@
    margin: 0 1em 0 1em;
 }
 
-.battlemap-message-board
+.battle-message-board
 {
    position: absolute;
    bottom: 0;
@@ -51,7 +51,7 @@
    justify-content: space-between;
 }
 
-.battlemap-container-centerer
+.battle-container-centerer
 {
    position: absolute;
    top: 4em;
@@ -62,7 +62,7 @@
    display: flex;
 }
 
-.battlemap-container
+.battle-container
 {
    display: inline-block;
    max-height: 100%;
@@ -81,7 +81,7 @@
    border-radius: 15px;
 }
 
-.battlemap-controlled
+.battle-controlled
 {
    position: absolute;
    left: 0;
@@ -107,7 +107,7 @@
    background-color: #917C6F;
 }
 
-.battlemap-sub-menu
+.battle-sub-menu
 {
    position: absolute;
    right: 0;
@@ -131,29 +131,29 @@
 /******************************************************************************/
 /** MESSAGE BOARD *************************************************************/
 /******************************************************************************/
-.battlemap-error
+.battle-error
 {
    background-color: #550000;
 }
 
-.battlemap-message-board .battlemap-character-card
+.battle-message-board .battle-character-card
 {
    width: 16em;
 }
 
-.battlemap-message-attack-text
+.battle-message-attack-text
 {
    width: 100%;
    text-align: center;
    font-size: 1.2em;
 }
 
-.battlemap-message-board-help
+.battle-message-board-help
 {
    display: block;
 }
 
-.battlemap-message-board-help h1
+.battle-message-board-help h1
 {
    margin: 0;
    margin-bottom: 0.3em;
@@ -161,7 +161,7 @@
    text-align: center;
 }
 
-.battlemap-message-board-help-figure
+.battle-message-board-help-figure
 {
    width: 1.5em;
    height: 1.5em;
@@ -170,7 +170,7 @@
    vertical-align: middle;
 }
 
-.battlemap-help-guide-icon
+.battle-help-guide-icon
 {
    margin-right: 0.5em;
    width: 1.5em;
@@ -184,7 +184,7 @@
 /******************************************************************************/
 /** CONTROLLED PANEL **********************************************************/
 /******************************************************************************/
-.battlemap-controlled-actions
+.battle-controlled-actions
 {
    display: flex;
    flex-flow: row wrap;
@@ -193,7 +193,7 @@
    justify-content: center;
 }
 
-.battlemap-end-turn-button
+.battle-end-turn-button
 {
    animation-name: reverse-brown-alarm-bg;
    animation-duration: 2s;
@@ -201,21 +201,21 @@
 }
 
 /** Character Card ************************************************************/
-.battlemap-character-card,
-.battlemap-tile-card
+.battle-character-card,
+.battle-tile-card
 {
    display: flex;
    flex-flow: column;
 }
 
-.battlemap-character-card-top,
-.battlemap-tile-card-top
+.battle-character-card-top,
+.battle-tile-card-top
 {
    margin-top: 0.5em;
    position: relative;
 }
 
-.battlemap-character-portrait
+.battle-character-portrait
 {
    box-sizing: border-box;
    border-radius: 5px;
@@ -225,12 +225,12 @@
    overflow: hidden;
 }
 
-.battlemap-character-portrait
+.battle-character-portrait
 {
    cursor: pointer;
 }
 
-.battlemap-tile-card-icon
+.battle-tile-card-icon
 {
    box-sizing: border-box;
    border-radius: 5px;
@@ -239,7 +239,7 @@
    height: 80px;
 }
 
-.battlemap-character-portrait *
+.battle-character-portrait *
 {
    box-sizing: border-box;
    background-size: 100% 100%;
@@ -247,12 +247,12 @@
    height: inherit;
 }
 
-.battlemap-character-portrait-body
+.battle-character-portrait-body
 {
    z-index: 1;
 }
 
-.battlemap-character-portrait-armor
+.battle-character-portrait-armor
 {
    position: relative;
    z-index: 1;
@@ -260,8 +260,8 @@
    background-size: 200% 100%;
 }
 
-.battlemap-character-card .battlemap-character-portrait,
-.battlemap-tile-card-icon
+.battle-character-card .battle-character-portrait,
+.battle-tile-card-icon
 {
    top: 0;
    left: 0;
@@ -274,24 +274,24 @@
       0px -1px 2px #333;
 }
 
-.battlemap-character-portrait-team-0 { background-color: rgba(57, 106, 177, 0.3); }
-.battlemap-character-portrait-team-1 { background-color: rgba(204, 37, 41, 0.3); }
-.battlemap-character-portrait-team-2 { background-color: rgba(62, 150, 81, 0.3); }
-.battlemap-character-portrait-team-3 { background-color: rgba(218, 124, 48, 0.3); }
-.battlemap-character-portrait-team-4 { background-color: rgba(83, 81, 84, 0.3); }
-.battlemap-character-portrait-team-5 { background-color: rgba(107, 76, 154, 0.3); }
-.battlemap-character-portrait-team-6 { background-color: rgba(127, 167, 169, 0.3); }
-.battlemap-character-portrait-team-7 { background-color: rgba(231, 167, 169, 0.3); }
+.battle-character-portrait-team-0 { background-color: rgba(57, 106, 177, 0.3); }
+.battle-character-portrait-team-1 { background-color: rgba(204, 37, 41, 0.3); }
+.battle-character-portrait-team-2 { background-color: rgba(62, 150, 81, 0.3); }
+.battle-character-portrait-team-3 { background-color: rgba(218, 124, 48, 0.3); }
+.battle-character-portrait-team-4 { background-color: rgba(83, 81, 84, 0.3); }
+.battle-character-portrait-team-5 { background-color: rgba(107, 76, 154, 0.3); }
+.battle-character-portrait-team-6 { background-color: rgba(127, 167, 169, 0.3); }
+.battle-character-portrait-team-7 { background-color: rgba(231, 167, 169, 0.3); }
 
-.battlemap-tile-card-top
+.battle-tile-card-top
 {
    margin:0.3em;
 }
 
-.battlemap-character-card-name,
-.battlemap-tile-card-name,
-.battlemap-tile-card-cost,
-.battlemap-tile-card-location
+.battle-character-card-name,
+.battle-tile-card-name,
+.battle-tile-card-cost,
+.battle-tile-card-location
 {
    display:flex;
    justify-content:center;
@@ -301,7 +301,7 @@
    width: 100%;
 }
 
-.battlemap-gauge
+.battle-gauge
 {
    position: relative;
    border-radius: 5px;
@@ -310,7 +310,7 @@
    height: 2em;
 }
 
-.battlemap-gauge-text
+.battle-gauge-text
 {
    position: absolute;
    top: 0;
@@ -325,7 +325,7 @@
    justify-content: center;
 }
 
-.battlemap-gauge-bar
+.battle-gauge-bar
 {
    position: absolute;
    top: 0;
@@ -339,8 +339,8 @@
    transition: width 3s ease-in-out;
 }
 
-.battlemap-character-card-health,
-.battlemap-tile-card-cost
+.battle-character-card-health,
+.battle-tile-card-cost
 {
    position: absolute;
    left: 100px;
@@ -350,13 +350,13 @@
 }
 
 
-.battlemap-character-card-health > .battlemap-gauge-bar
+.battle-character-card-health > .battle-gauge-bar
 {
    background-color: darkred;
 }
 
-.battlemap-character-card-movement,
-.battlemap-tile-card-location
+.battle-character-card-movement,
+.battle-tile-card-location
 {
    position: absolute;
    left: 100px;
@@ -365,7 +365,7 @@
    width: calc(100% - 100px - 0.5em);
 }
 
-.battlemap-character-card-statuses
+.battle-character-card-statuses
 {
    position: absolute;
    left: 100px;
@@ -375,30 +375,30 @@
    display: flex;
 }
 
-.battlemap-character-card-status
+.battle-character-card-status
 {
    height: 1.5em;
    width: 1.5em;
    background-size: 100%;
 }
 
-.battlemap-character-card-target-status
+.battle-character-card-target-status
 {
    background-image: url("/asset/svg/status/target.svg");
 }
 
-.battlemap-character-card-commander-status
+.battle-character-card-commander-status
 {
    background-image: url("/asset/svg/status/commander.svg");
 }
 
-.battlemap-character-card-movement > .battlemap-gauge-bar
+.battle-character-card-movement > .battle-gauge-bar
 {
    background-color: darkgrey;
 }
 
-.battlemap-character-card-weapon,
-.battlemap-character-card-weapon-summary
+.battle-character-card-weapon,
+.battle-character-card-weapon-summary
 {
    display: grid;
 
@@ -408,17 +408,17 @@
    margin-top: 0.3em;
 }
 
-.battlemap-character-card-weapon
+.battle-character-card-weapon
 {
    background-color: #6C5D53;
 }
 
-.battlemap-character-card-weapon-summary
+.battle-character-card-weapon-summary
 {
    background-color: #393939;
 }
 
-.battlemap-character-card-armor
+.battle-character-card-armor
 {
    display: grid;
    border-radius: 5px;
@@ -428,13 +428,13 @@
    margin-top: 0.3em;
 }
 
-.battlemap-character-card-armor-stats
+.battle-character-card-armor-stats
 {
    display: grid;
    grid-template-columns: [col] 25% [col] 25% [col] 25% [col] 25%;
 }
 
-.battlemap-character-card-stats
+.battle-character-card-stats
 {
    display: grid;
    grid-template-columns: [col] 25% [col] 25% [col] 25% [col] 25%;
@@ -447,7 +447,7 @@
 }
 
 /** Manual Controls ***********************************************************/
-.battlemap-manual-controls
+.battle-manual-controls
 {
    width: 96px;
    height: 96px;
@@ -459,7 +459,7 @@
    margin: auto;
 }
 
-.battlemap-manual-controls > div
+.battle-manual-controls > div
 {
    width: 32px;
    height: 32px;
@@ -469,12 +469,12 @@
    opacity: 0.5;
 }
 
-.battlemap-manual-controls > div:hover
+.battle-manual-controls > div:hover
 {
    opacity: 1;
 }
 
-.battlemap-manual-controls-go
+.battle-manual-controls-go
 {
    margin: auto;
    width: 28px;
@@ -483,25 +483,25 @@
    grid-area: go;
 }
 
-.battlemap-manual-controls-up
+.battle-manual-controls-up
 {
    transform: rotate(-90deg);
    grid-area: top;
 }
 
-.battlemap-manual-controls-down
+.battle-manual-controls-down
 {
    transform: rotate(90deg);
    grid-area: bottom;
 }
 
-.battlemap-manual-controls-left
+.battle-manual-controls-left
 {
    transform: rotate(180deg);
    grid-area: left;
 }
 
-.battlemap-manual-controls-right
+.battle-manual-controls-right
 {
    grid-area: right;
 }
@@ -509,7 +509,7 @@
 /******************************************************************************/
 /** MAIN MENU *****************************************************************/
 /******************************************************************************/
-.battlemap-main-menu
+.battle-main-menu
 {
    display: flex;
    flex-direction: row;
@@ -517,7 +517,7 @@
    justify-content: space-between;
 }
 
-.battlemap-main-menu button
+.battle-main-menu button
 {
    flex: 1;
 
@@ -527,7 +527,7 @@
 /******************************************************************************/
 /** SUB-MENU ******************************************************************/
 /******************************************************************************/
-.battlemap-tabmenu-characters-tab
+.battle-tabmenu-characters-tab
 {
    display: flex;
    flex-grow: 1;
@@ -535,7 +535,7 @@
    flex-wrap: wrap;
 }
 
-.battlemap-characters-element-active
+.battle-characters-element-active
 {
    animation-name: brown-alarm-bg;
    animation-duration: 5s;
@@ -544,8 +544,8 @@
 
 
 
-.battlemap-timeline-element,
-.battlemap-characters-element
+.battle-timeline-element,
+.battle-characters-element
 {
    flex: 2;
    margin: 0.5em 0.5em 0 0.5em;
@@ -556,7 +556,7 @@
    padding: 0.5em;
 }
 
-.battlemap-timeline-element .battlemap-character-portrait
+.battle-timeline-element .battle-character-portrait
 {
    display: inline-block;
    vertical-align: middle;
@@ -567,7 +567,7 @@
 /******************************************************************************/
 /** Main View Elements ********************************************************/
 /******************************************************************************/
-.battlemap-actual
+.battle-actual
 {
    display: inline-block;
    transform-origin: top left;
@@ -577,7 +577,7 @@
    background-color: #917C6F;
 }
 
-.battlemap-tiled
+.battle-tiled
 {
    height: 32px;
    width: 32px;
@@ -586,46 +586,46 @@
    /* max-width: 32px; */
 }
 
-.battlemap-tile-variant-0  {background-position: 0    0;}
-.battlemap-tile-variant-1  {background-position: 100% 0;}
-.battlemap-tile-variant-2  {background-position: 200% 0;}
-.battlemap-tile-variant-3  {background-position: 0    100%;}
-.battlemap-tile-variant-4  {background-position: 100% 100%;}
-.battlemap-tile-variant-5  {background-position: 200% 100%;}
-.battlemap-tile-variant-6  {background-position: 0    200%;}
-.battlemap-tile-variant-7  {background-position: 100% 200%;}
-.battlemap-tile-variant-8  {background-position: 200% 200%;}
+.battle-tile-variant-0  {background-position: 0    0;}
+.battle-tile-variant-1  {background-position: 100% 0;}
+.battle-tile-variant-2  {background-position: 200% 0;}
+.battle-tile-variant-3  {background-position: 0    100%;}
+.battle-tile-variant-4  {background-position: 100% 100%;}
+.battle-tile-variant-5  {background-position: 200% 100%;}
+.battle-tile-variant-6  {background-position: 0    200%;}
+.battle-tile-variant-7  {background-position: 100% 200%;}
+.battle-tile-variant-8  {background-position: 200% 200%;}
 
-.battlemap-tile-icon       {z-index: 0; position: absolute; background-size: 300%;}
-.battlemap-path-icon-below-markers {z-index: 1;}
-.battlemap-marker-icon     {z-index: 2;}
-.battlemap-path-icon-above-markers {z-index: 3;}
-.battlemap-character-icon  {z-index: 4;}
+.battle-tile-icon       {z-index: 0; position: absolute; background-size: 300%;}
+.battle-path-icon-below-markers {z-index: 1;}
+.battle-marker-icon     {z-index: 2;}
+.battle-path-icon-above-markers {z-index: 3;}
+.battle-character-icon  {z-index: 4;}
 
-.battlemap-marker-icon,
-.battlemap-character-icon,
-.battlemap-path-icon
+.battle-marker-icon,
+.battle-character-icon,
+.battle-path-icon
 {
    position: absolute;
 }
-.battlemap-tiles-layer
+.battle-tiles-layer
 {
    /*display: table; */
 }
 
-.battlemap-tiles-layer-row
+.battle-tiles-layer-row
 {
   /* display: table-row; */
 }
 
-.battlemap-character-icon
+.battle-character-icon
 {
    border-radius: 5px;
    height: 38px;
    margin-top: -6px;
 }
 
-.battlemap-character-icon *
+.battle-character-icon *
 {
    position: absolute;
    left: 0;
@@ -635,7 +635,7 @@
    height: inherit;
 }
 
-.battlemap-character-icon-enabled
+.battle-character-icon-enabled
 {
    animation-name: pulsating;
    animation-duration: 1.5s;
@@ -643,21 +643,21 @@
    transform-origin: center;
 }
 
-.battlemap-character-icon-banner { z-index: 2; }
-.battlemap-character-icon-head { z-index: 1; }
-.battlemap-character-icon-body { z-index: 0; }
+.battle-character-icon-banner { z-index: 2; }
+.battle-character-icon-head { z-index: 1; }
+.battle-character-icon-body { z-index: 0; }
 
-.battlemap-character-ally
+.battle-character-ally
 {
 }
 
-.battlemap-character-enemy
+.battle-character-enemy
 {
    transform: scale(-1, 1);
 }
 
 /** Navigator Markers *********************************************************/
-.battlemap-marker-icon.battlemap-navigator-non-interactive
+.battle-marker-icon.battle-navigator-non-interactive
 {
    box-sizing: border-box;
    width: 12px;
@@ -666,7 +666,7 @@
    margin: 10px;
 }
 
-.battlemap-marker-icon.battlemap-navigator-interactive
+.battle-marker-icon.battle-navigator-interactive
 {
    box-sizing: border-box;
    width: 24px;
@@ -683,14 +683,14 @@
       0px -1px 2px #333;
 }
 
-.battlemap-can-go-to-can-defend-marker.battlemap-navigator-interactive
+.battle-can-go-to-can-defend-marker.battle-navigator-interactive
 {
    background-color: #FFF;
    opacity: 0.3;
    transition: opacity 0.3s ease-out;
 }
 
-.battlemap-can-go-to-cant-defend-marker.battlemap-navigator-interactive
+.battle-can-go-to-cant-defend-marker.battle-navigator-interactive
 {
    background:
       repeating-linear-gradient(
@@ -704,13 +704,13 @@
    transition: opacity 0.3s ease-out;
 }
 
-.battlemap-can-go-to-can-defend-marker.battlemap-navigator-interactive:hover,
-.battlemap-can-go-to-cant-defend-marker.battlemap-navigator-interactive:hover
+.battle-can-go-to-can-defend-marker.battle-navigator-interactive:hover,
+.battle-can-go-to-cant-defend-marker.battle-navigator-interactive:hover
 {
    opacity: 0.9;
 }
 
-.battlemap-can-attack-can-defend-marker.battlemap-navigator-interactive
+.battle-can-attack-can-defend-marker.battle-navigator-interactive
 {
    background-color: #000;
    opacity: 0.7;
@@ -722,7 +722,7 @@
    border-radius: 0;
 }
 
-.battlemap-can-attack-cant-defend-marker.battlemap-navigator-interactive
+.battle-can-attack-cant-defend-marker.battle-navigator-interactive
 {
    background:
       repeating-linear-gradient(
@@ -741,13 +741,13 @@
    border-radius: 0;
 }
 
-.battlemap-can-attack-can-defend-marker.battlemap-navigator-non-interactive
+.battle-can-attack-can-defend-marker.battle-navigator-non-interactive
 {
    z-index: 5;
    background-image: url(/asset/svg/marker/blade.svg);
 }
 
-.battlemap-can-attack-cant-defend-marker.battlemap-navigator-non-interactive
+.battle-can-attack-cant-defend-marker.battle-navigator-non-interactive
 {
    z-index: 5;
    background-image:
@@ -755,15 +755,15 @@
       url(/asset/svg/marker/brokenshield.svg);
 }
 
-.battlemap-can-go-to-cant-defend-marker.battlemap-navigator-non-interactive
+.battle-can-go-to-cant-defend-marker.battle-navigator-non-interactive
 {
    background-image:
       url(/asset/svg/marker/pawprint.svg),
       url(/asset/svg/marker/brokenshield.svg);
 }
 
-.battlemap-can-attack-cant-defend-marker.battlemap-navigator-non-interactive,
-.battlemap-can-go-to-cant-defend-marker.battlemap-navigator-non-interactive
+.battle-can-attack-cant-defend-marker.battle-navigator-non-interactive,
+.battle-can-go-to-cant-defend-marker.battle-navigator-non-interactive
 {
    width: 24px;
    height: 24px;
@@ -773,24 +773,24 @@
    margin: 2px;
 }
 
-.battlemap-can-go-to-can-defend-marker.battlemap-navigator-non-interactive
+.battle-can-go-to-can-defend-marker.battle-navigator-non-interactive
 {
    background-image: url(/asset/svg/marker/pawprint.svg);
 }
 
-.battlemap-can-attack-can-defend-marker.battlemap-navigator-non-interactive,
-.battlemap-can-attack-cant-defend-marker.battlemap-navigator-non-interactive
+.battle-can-attack-can-defend-marker.battle-navigator-non-interactive,
+.battle-can-attack-cant-defend-marker.battle-navigator-non-interactive
 {
    z-index: 5;
 }
 
-.battlemap-can-go-to-can-defend-marker,
-.battlemap-can-go-to-cant-defend-marker
+.battle-can-go-to-can-defend-marker,
+.battle-can-go-to-cant-defend-marker
 {
    z-index: 3;
 }
 
-.battlemap-cant-defend-marker
+.battle-cant-defend-marker
 {
    background:
       repeating-linear-gradient(
@@ -802,14 +802,14 @@
       );
 }
 
-.battlemap-character-ally.battlemap-character-icon-disabled
+.battle-character-ally.battle-character-icon-disabled
 {
    filter: contrast(35%);
 }
 
 
 /**** Selection Classes *******************************************************/
-.battlemap-character-targeted
+.battle-character-targeted
 {
    background-color: rgba(255,0,0,0.7);
    animation-name: red-alarm-bg;
@@ -817,7 +817,7 @@
    animation-iteration-count: infinite;
 }
 
-.battlemap-character-selected
+.battle-character-selected
 {
    animation-name: strongly-pulsating;
    animation-duration: 1.5s;
@@ -825,91 +825,91 @@
 }
 
 /**** Path Icons **************************************************************/
-.battlemap-path-icon
+.battle-path-icon
 {
    background-image: url("/asset/svg/arrows.svg");
    background-size: 96px 32px;
 }
 
-.battlemap-path-icon-UR,
-.battlemap-path-icon-LD,
-.battlemap-path-icon-RD,
-.battlemap-path-icon-UL,
-.battlemap-path-icon-LU,
-.battlemap-path-icon-DR,
-.battlemap-path-icon-DL,
-.battlemap-path-icon-RU
+.battle-path-icon-UR,
+.battle-path-icon-LD,
+.battle-path-icon-RD,
+.battle-path-icon-UL,
+.battle-path-icon-LU,
+.battle-path-icon-DR,
+.battle-path-icon-DL,
+.battle-path-icon-RU
 {
    /*** Default is -^ ***/
    background-position: 64px 0;
 }
 /*** DL/RU ***/
 
-.battlemap-path-icon-LU,
-.battlemap-path-icon-DR
+.battle-path-icon-LU,
+.battle-path-icon-DR
 {
    transform: rotate(90deg);
 }
 
-.battlemap-path-icon-RD,
-.battlemap-path-icon-UL
+.battle-path-icon-RD,
+.battle-path-icon-UL
 {
    /***  ***/
    transform: scale(1, -1);
 }
 
-.battlemap-path-icon-UR,
-.battlemap-path-icon-LD
+.battle-path-icon-UR,
+.battle-path-icon-LD
 {
    /*** <| ***/
    transform: rotate(180deg);
 }
 
-.battlemap-path-icon-RR,
-.battlemap-path-icon-LR,
-.battlemap-path-icon-RL,
-.battlemap-path-icon-LL
+.battle-path-icon-RR,
+.battle-path-icon-LR,
+.battle-path-icon-RL,
+.battle-path-icon-LL
 {
    background-position: 0 0;
 }
 
-.battlemap-path-icon-markN,
-.battlemap-path-icon-NU,
-.battlemap-path-icon-ND,
-.battlemap-path-icon-NL,
-.battlemap-path-icon-NR
+.battle-path-icon-markN,
+.battle-path-icon-NU,
+.battle-path-icon-ND,
+.battle-path-icon-NL,
+.battle-path-icon-NR
 {
    display: none;
 }
 
-.battlemap-path-icon-UU,
-.battlemap-path-icon-UD,
-.battlemap-path-icon-DU,
-.battlemap-path-icon-DD
+.battle-path-icon-UU,
+.battle-path-icon-UD,
+.battle-path-icon-DU,
+.battle-path-icon-DD
 {
    background-position: 0 0;
    transform: rotate(90deg);
 }
 
-.battlemap-path-icon-markR,
-.battlemap-path-icon-markL,
-.battlemap-path-icon-markU,
-.battlemap-path-icon-markD
+.battle-path-icon-markR,
+.battle-path-icon-markL,
+.battle-path-icon-markU,
+.battle-path-icon-markD
 {
    background-position: 32px 0;
 }
 
-.battlemap-path-icon-markL
+.battle-path-icon-markL
 {
    transform: rotate(180deg);
 }
 
-.battlemap-path-icon-markD
+.battle-path-icon-markD
 {
    transform: rotate(90deg);
 }
 
-.battlemap-path-icon-markU
+.battle-path-icon-markU
 {
    transform: rotate(-90deg);
 }
@@ -1001,49 +1001,49 @@
 /** Timeline Animations *******************************************************/
 /******************************************************************************/
 /**** Character Icon Animations ***********************************************/
-.battlemap-animated-character-icon
+.battle-animated-character-icon
 {
    transition: top linear 0.3s, left linear 0.3s;
 }
 
 /**** Character Portrait Animations *******************************************/
-.battlemap-animated-portrait-damaged .battlemap-character-portrait > *
+.battle-animated-portrait-damaged .battle-character-portrait > *
 {
    animation: blinking 0.2s steps(2, start) 8;
 }
 
-.battlemap-animated-portrait-absent .battlemap-character-portrait > *
+.battle-animated-portrait-absent .battle-character-portrait > *
 {
    visibility: hidden;
 }
 
-.battlemap-animated-portrait-dodges .battlemap-character-portrait,
-.battlemap-animated-portrait-dies .battlemap-character-portrait,
-.battlemap-animated-portrait-parries .battlemap-character-portrait,
-.battlemap-animated-portrait-attacks .battlemap-character-portrait
+.battle-animated-portrait-dodges .battle-character-portrait,
+.battle-animated-portrait-dies .battle-character-portrait,
+.battle-animated-portrait-parries .battle-character-portrait,
+.battle-animated-portrait-attacks .battle-character-portrait
 {
    overflow: hidden;
 }
 
-.battlemap-animated-portrait
+.battle-animated-portrait
 {
 }
 
-.battlemap-animated-portrait-dodges .battlemap-character-portrait > *
+.battle-animated-portrait-dodges .battle-character-portrait > *
 {
    animation-name: dodges;
    animation-duration: 1s;
    animation-iteration-count: 1;
 }
 
-.battlemap-animated-portrait-attacks .battlemap-character-portrait > *
+.battle-animated-portrait-attacks .battle-character-portrait > *
 {
    animation-name: attacks;
    animation-duration: 1s;
    animation-iteration-count: 1;
 }
 
-.battlemap-animated-portrait-dies .battlemap-character-portrait > *
+.battle-animated-portrait-dies .battle-character-portrait > *
 {
    animation-name: blinking2, dies;
    animation-duration: 0.15s, 2s;
@@ -1051,7 +1051,7 @@
    animation-iteration-count: 8, 1;
 }
 
-.battlemap-animated-portrait-parries .battlemap-character-portrait > *
+.battle-animated-portrait-parries .battle-character-portrait > *
 {
    animation-name: parries;
    animation-duration: 1s;
diff --git a/src/battlemap/src/Constants/IO.elm.m4 b/src/battlemap/src/Constants/IO.elm.m4
deleted file mode 100644
index 216b0c8..0000000
--- a/src/battlemap/src/Constants/IO.elm.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-module Constants.IO exposing (..)
-
-base_url : String
-base_url = "__CONF_SERVER_URL"
-
-battlemap_handler_url : String
-battlemap_handler_url = (base_url ++ "/handler/battlemap")
-
-character_turn_handler : String
-character_turn_handler = (battlemap_handler_url ++ "/bm_character_turn")
-
-battlemap_loading_handler : String
-battlemap_loading_handler = (battlemap_handler_url ++ "/bm_load_state")
-
-tile_assets_url : String
-tile_assets_url = (base_url ++ "/asset/svg/tile/")
diff --git a/www/index.html.m4 b/www/index.html.m4
index a0bbdde..2046133 100644
--- a/www/index.html.m4
+++ b/www/index.html.m4
@@ -18,7 +18,11 @@
          <p>This website lets you play the game, even during its development phase. As a result, there is a lot missing.</p>
          <p>
             Having accounts at that stage would needlessly slow us down, so access to
-            <a href="/battlemap/?id=0">the game's battle system</a> is done without login in.
+            <a href="/battle/?id=0">the game's battle system</a> is done without login in.
+         </p>
+         <p>
+            <a href="/map-editor/?id=0">The game's map editor</a> is also
+            available, albeit nowhere near as finished.
          </p>
          <p>You can access the source code for the game this website is running, under the Apache 2.0 License:</p>
          <ul>