It compiles again. The battle module is clearly broken, though...

50 files changed, 174 insertions, 166 deletions

diff --git a/src/battle/src/Update/Character/LookForCharacter.elm b/src/battle/src/Update/Character/LookForCharacter.elm
index 49f788d..791ad21 100644
--- a/src/battle/src/Update/Character/LookForCharacter.elm
+++ b/src/battle/src/Update/Character/LookForCharacter.elm
@@ -35,11 +35,11 @@ scroll_to_char model char_ix =
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 apply_to : (
-      Struct.Model.Type ->
       Int ->
+      Struct.Model.Type ->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
-apply_to model target_ix =
+apply_to target_ix model =
    (
       {model |
          ui =
diff --git a/src/battle/src/Update/CharacterTurn/SwitchWeapon.elm b/src/battle/src/Update/CharacterTurn/SwitchWeapon.elm
index 632e10c..973ac36 100644
--- a/src/battle/src/Update/CharacterTurn/SwitchWeapon.elm
+++ b/src/battle/src/Update/CharacterTurn/SwitchWeapon.elm
@@ -20,10 +20,7 @@ import Util.Navigator
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-apply_to : (
-      Struct.Model.Type ->
-      (Struct.Model.Type, (Cmd Struct.Event.Type))
-   )
+apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 apply_to model =
    case (Struct.CharacterTurn.maybe_get_active_character model.char_turn) of
       (Just char) ->
diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm
index a5b026c..eb5e612 100644
--- a/src/battle/src/Update/HandleServerReply.elm
+++ b/src/battle/src/Update/HandleServerReply.elm
@@ -270,11 +270,11 @@ server_command_to_update server_command =
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 apply_to : (
-      Struct.Model.Type ->
       (Result Http.Error (List Struct.ServerReply.Type)) ->
+      Struct.Model.Type ->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
-apply_to model query_result =
+apply_to query_result model =
    case query_result of
       (Result.Err error) ->
          (
diff --git a/src/battle/src/Update/Puppeteer.elm b/src/battle/src/Update/Puppeteer.elm
index dcdefcc..f4fa8dd 100644
--- a/src/battle/src/Update/Puppeteer.elm
+++ b/src/battle/src/Update/Puppeteer.elm
@@ -166,10 +166,7 @@ apply_effects_backward effects model =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-apply_to : (
-      Struct.Model.Type ->
-      (Struct.Model.Type, (Cmd Struct.Event.Type))
-   )
+apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 apply_to model =
    case (Struct.Puppeteer.maybe_get_current_action model.puppeteer) of
       Nothing -> (model, (Cmd.none))
diff --git a/src/battle/src/Update/SetRequestedHelp.elm b/src/battle/src/Update/SetRequestedHelp.elm
index 6a56752..0010566 100644
--- a/src/battle/src/Update/SetRequestedHelp.elm
+++ b/src/battle/src/Update/SetRequestedHelp.elm
@@ -14,11 +14,11 @@ import Struct.Model
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 apply_to : (
-      Struct.Model.Type ->
       Struct.HelpRequest.Type ->
+      Struct.Model.Type ->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
-apply_to model help_request =
+apply_to help_request model =
    (
       {model |
          message_board =
diff --git a/src/battle/src/Update/UI/ChangeScale.elm b/src/battle/src/Update/UI/ChangeScale.elm
index b5884ff..cacde41 100644
--- a/src/battle/src/Update/UI/ChangeScale.elm
+++ b/src/battle/src/Update/UI/ChangeScale.elm
@@ -13,11 +13,11 @@ import Struct.UI
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 apply_to : (
-      Struct.Model.Type ->
       Float ->
+      Struct.Model.Type ->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
-apply_to model mod =
+apply_to mod model =
    if (mod == 0.0)
    then ({model | ui = (Struct.UI.reset_zoom_level model.ui)}, Cmd.none)
    else ({model | ui = (Struct.UI.mod_zoom_level mod model.ui)}, Cmd.none)
diff --git a/src/battle/src/Update/UI/SelectTab.elm b/src/battle/src/Update/UI/SelectTab.elm
index 37ab910..0c2d6de 100644
--- a/src/battle/src/Update/UI/SelectTab.elm
+++ b/src/battle/src/Update/UI/SelectTab.elm
@@ -13,11 +13,11 @@ import Struct.UI
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 apply_to : (
-      Struct.Model.Type ->
       Struct.UI.Tab ->
+      Struct.Model.Type ->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
-apply_to model tab =
+apply_to tab model =
    if ((Struct.UI.maybe_get_displayed_tab model.ui) == (Just tab))
    then
       (
diff --git a/src/battle/src/View/MessageBoard/Help/Guide.elm b/src/battle/src/View/MessageBoard/Help/Guide.elm
index d60dd6b..1ebecb9 100644
--- a/src/battle/src/View/MessageBoard/Help/Guide.elm
+++ b/src/battle/src/View/MessageBoard/Help/Guide.elm
@@ -52,8 +52,8 @@ get_moved_character_html_contents =
       )
    ]
 
-get_chose_target_html_contents : (List (Html.Html Struct.Event.Type))
-get_chose_target_html_contents =
+get_attacking_html_contents : (List (Html.Html Struct.Event.Type))
+get_attacking_html_contents =
    [
       (get_header_html "End the Turn by an Attack"),
       (Html.text
@@ -66,8 +66,8 @@ button to start this turn over."""
       )
    ]
 
-get_switched_weapons_html_contents : (List (Html.Html Struct.Event.Type))
-get_switched_weapons_html_contents =
+get_switching_weapons_html_contents : (List (Html.Html Struct.Event.Type))
+get_switching_weapons_html_contents =
    [
       (get_header_html "End the Turn by Switching Weapons"),
       (Html.text
@@ -102,18 +102,12 @@ get_html_contents : (
       (List (Html.Html Struct.Event.Type))
    )
 get_html_contents model =
-   case (Struct.CharacterTurn.get_state model.char_turn) of
-      Struct.CharacterTurn.SelectedCharacter ->
-         (get_selected_character_html_contents)
+   case (Struct.CharacterTurn.get_action model.char_turn) of
+      Struct.CharacterTurn.Attacking ->
+         (get_attacking_html_contents)
 
-      Struct.CharacterTurn.MovedCharacter ->
-         (get_moved_character_html_contents)
-
-      Struct.CharacterTurn.ChoseTarget ->
-         (get_chose_target_html_contents)
-
-      Struct.CharacterTurn.SwitchedWeapons ->
-         (get_switched_weapons_html_contents)
+      Struct.CharacterTurn.SwitchingWeapons ->
+         (get_switching_weapons_html_contents)
 
       _ ->
          (get_default_html_contents)
diff --git a/src/login/src/ElmModule/Init.elm b/src/login/src/ElmModule/Init.elm
index 9574712..54897d7 100644
--- a/src/login/src/ElmModule/Init.elm
+++ b/src/login/src/ElmModule/Init.elm
@@ -2,9 +2,11 @@ module ElmModule.Init exposing (init)
 
 -- Elm -------------------------------------------------------------------------
 
--- Map -------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------------
+import Shared.Struct.Flags
+
+-- Local Module ----------------------------------------------------------
 import Struct.Event
-import Struct.Flags
 import Struct.Model
 
 import Update.Disconnect
@@ -17,12 +19,12 @@ import Update.HandleConnected
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
+init : Shared.Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 init flags =
    let
       new_model = (Struct.Model.new flags)
    in
-      case (Struct.Flags.maybe_get_parameter "action" flags) of
+      case (Shared.Struct.Flags.maybe_get_parameter "action" flags) of
          (Just "disconnect") -> (Update.Disconnect.apply_to new_model)
          _ ->
             if (flags.user_id == "")
diff --git a/src/login/src/ElmModule/Subscriptions.elm b/src/login/src/ElmModule/Subscriptions.elm
index 9376f89..e777111 100644
--- a/src/login/src/ElmModule/Subscriptions.elm
+++ b/src/login/src/ElmModule/Subscriptions.elm
@@ -2,9 +2,10 @@ module ElmModule.Subscriptions exposing (..)
 
 -- Elm -------------------------------------------------------------------------
 
--- Main Menu -------------------------------------------------------------------
-import Action.Ports
+-- Shared ----------------------------------------------------------------------
+import Shared.Action.Ports
 
+-- Main Menu -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 
@@ -16,4 +17,4 @@ import Struct.Event
 --------------------------------------------------------------------------------
 subscriptions : Struct.Model.Type -> (Sub Struct.Event.Type)
 subscriptions model =
-   (Action.Ports.connected (always Struct.Event.Connected))
+   (Shared.Action.Ports.connected (always Struct.Event.Connected))
diff --git a/src/login/src/ElmModule/View.elm b/src/login/src/ElmModule/View.elm
index f6c5c93..21236a7 100644
--- a/src/login/src/ElmModule/View.elm
+++ b/src/login/src/ElmModule/View.elm
@@ -4,14 +4,15 @@ module ElmModule.View exposing (view)
 import Html
 import Html.Attributes
 
--- Map -------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------
+import Shared.Util.Html
+
+-- Local Module ----------------------------------------------------------
 import Struct.Error
 import Struct.Event
 import Struct.Model
 import Struct.UI
 
-import Util.Html
-
 import View.AccountRecovery
 import View.Header
 import View.MainMenu
@@ -51,7 +52,7 @@ view model =
                ),
                (
                   case model.error of
-                     Nothing -> (Util.Html.nothing)
+                     Nothing -> (Shared.Util.Html.nothing)
                      (Just err) ->
                         (Html.div
                            [
diff --git a/src/login/src/Main.elm b/src/login/src/Main.elm
index 384ecd8..bc838e0 100644
--- a/src/login/src/Main.elm
+++ b/src/login/src/Main.elm
@@ -3,17 +3,19 @@ module Main exposing (main)
 -- Elm ------------------------------------------------------------------------
 import Browser
 
--- Map -------------------------------------------------------------------
+-- Shared ----------------------------------------------------------------
+import Shared.Struct.Flags
+
+-- Local Module ----------------------------------------------------------
 import Struct.Model
 import Struct.Event
-import Struct.Flags
 
 import ElmModule.Init
 import ElmModule.Subscriptions
 import ElmModule.View
 import ElmModule.Update
 
-main : (Program Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
+main : (Program Shared.Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
 main =
    (Browser.element
       {
diff --git a/src/login/src/Struct/Event.elm b/src/login/src/Struct/Event.elm
index faa4a2f..1c7085c 100644
--- a/src/login/src/Struct/Event.elm
+++ b/src/login/src/Struct/Event.elm
@@ -3,9 +3,6 @@ module Struct.Event exposing (Type(..), attempted)
 -- Elm -------------------------------------------------------------------------
 import Http
 
--- Shared ----------------------------------------------------------------------
-import Util.Http
-
 -- Login -----------------------------------------------------------------------
 import Struct.Error
 import Struct.ServerReply
diff --git a/src/login/src/Struct/Model.elm b/src/login/src/Struct/Model.elm
index 3a721c1..4cb2288 100644
--- a/src/login/src/Struct/Model.elm
+++ b/src/login/src/Struct/Model.elm
@@ -10,9 +10,9 @@ module Struct.Model exposing
 -- Elm -------------------------------------------------------------------------
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
--- Login -----------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.Error
 import Struct.HelpRequest
 import Struct.UI
@@ -24,7 +24,7 @@ type alias Type =
    {
       help_request: Struct.HelpRequest.Type,
       error: (Maybe Struct.Error.Type),
-      flags: Struct.Flags.Type,
+      flags: Shared.Struct.Flags.Type,
       username: String,
       password1: String,
       password2: String,
@@ -42,10 +42,10 @@ type alias Type =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-new : Struct.Flags.Type -> Type
+new : Shared.Struct.Flags.Type -> Type
 new flags =
    let
-      maybe_mode = (Struct.Flags.maybe_get_parameter "mode" flags)
+      maybe_mode = (Shared.Struct.Flags.maybe_get_parameter "mode" flags)
       model =
          {
             help_request = Struct.HelpRequest.None,
diff --git a/src/login/src/Update/Disconnect.elm b/src/login/src/Update/Disconnect.elm
index 991b78a..0f59631 100644
--- a/src/login/src/Update/Disconnect.elm
+++ b/src/login/src/Update/Disconnect.elm
@@ -1,9 +1,10 @@
 module Update.Disconnect exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 
--- Login -----------------------------------------------------------------------
-import Action.Ports
+-- Shared ----------------------------------------------------------------------
+import Shared.Action.Ports
 
+-- Local Module ----------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 
@@ -18,5 +19,5 @@ apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 apply_to model =
    (
       model,
-      (Action.Ports.reset_session ())
+      (Shared.Action.Ports.reset_session ())
    )
diff --git a/src/login/src/Update/HandleConnected.elm b/src/login/src/Update/HandleConnected.elm
index 15e3371..099036a 100644
--- a/src/login/src/Update/HandleConnected.elm
+++ b/src/login/src/Update/HandleConnected.elm
@@ -3,13 +3,15 @@ module Update.HandleConnected exposing (apply_to)
 -- Elm -------------------------------------------------------------------------
 import Url
 
--- Login -----------------------------------------------------------------------
-import Action.Ports
+-- Shared ----------------------------------------------------------------------
+import Shared.Action.Ports
 
+import Shared.Struct.Flags
+
+-- Local Module ----------------------------------------------------------------
 import Constants.IO
 
 import Struct.Event
-import Struct.Flags
 import Struct.Model
 
 --------------------------------------------------------------------------------
@@ -23,10 +25,12 @@ apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 apply_to model =
    (
       model,
-      (Action.Ports.go_to
+      (Shared.Action.Ports.go_to
          (Constants.IO.base_url ++
             (
-               case (Struct.Flags.maybe_get_parameter "goto" model.flags) of
+               case
+                  (Shared.Struct.Flags.maybe_get_parameter "goto" model.flags)
+               of
                   Nothing -> "/main-menu/"
                   (Just string) ->
                      case (Url.percentDecode string) of
diff --git a/src/login/src/Update/HandleServerReply.elm b/src/login/src/Update/HandleServerReply.elm
index 1fcb240..6d770c6 100644
--- a/src/login/src/Update/HandleServerReply.elm
+++ b/src/login/src/Update/HandleServerReply.elm
@@ -4,11 +4,11 @@ module Update.HandleServerReply exposing (apply_to)
 import Http
 
 -- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
 
-import Util.Http
+import Shared.Util.Http
 
--- Login -----------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.Error
 import Struct.Event
 import Struct.Model
@@ -35,7 +35,7 @@ set_session pid stk current_state =
             session_token = stk
          },
          (
-            (Action.Ports.store_new_session (pid, stk))
+            (Shared.Action.Ports.store_new_session (pid, stk))
             :: cmds
          )
       )
@@ -67,7 +67,7 @@ apply_to model query_result =
             (Struct.Model.invalidate
                (Struct.Error.new
                   Struct.Error.Networking
-                  (Util.Http.error_to_string error)
+                  (Shared.Util.Http.error_to_string error)
                )
                model
             ),
diff --git a/src/main-menu/src/ElmModule/Init.elm b/src/main-menu/src/ElmModule/Init.elm
index 367af39..4e2725a 100644
--- a/src/main-menu/src/ElmModule/Init.elm
+++ b/src/main-menu/src/ElmModule/Init.elm
@@ -2,11 +2,13 @@ module ElmModule.Init exposing (init)
 
 -- Elm -------------------------------------------------------------------------
 
+-- Shared ----------------------------------------------------------------------
+import Shared.Struct.Flags
+
 -- Main Menu -------------------------------------------------------------------
 import Comm.LoadPlayer
 
 import Struct.Event
-import Struct.Flags
 import Struct.Model
 
 --------------------------------------------------------------------------------
@@ -16,7 +18,7 @@ import Struct.Model
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
+init : Shared.Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 init flags =
    let
       model = (Struct.Model.new flags)
diff --git a/src/main-menu/src/ElmModule/View.elm b/src/main-menu/src/ElmModule/View.elm
index 561f924..1563a73 100644
--- a/src/main-menu/src/ElmModule/View.elm
+++ b/src/main-menu/src/ElmModule/View.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Main Menu -------------------------------------------------------------------
 import Struct.Error
@@ -33,7 +33,7 @@ view model =
          (View.CurrentTab.get_html model),
          (
             case model.error of
-               Nothing -> (Util.Html.nothing)
+               Nothing -> (Shared.Util.Html.nothing)
                (Just err) ->
                   (Html.div
                      []
diff --git a/src/main-menu/src/Main.elm b/src/main-menu/src/Main.elm
index 4922621..433a4e0 100644
--- a/src/main-menu/src/Main.elm
+++ b/src/main-menu/src/Main.elm
@@ -3,17 +3,19 @@ module Main exposing (main)
 -- Elm ------------------------------------------------------------------------
 import Browser
 
+-- Shared ----------------------------------------------------------------------
+import Shared.Struct.Flags
+
 -- Main Menu -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
-import Struct.Flags
 
 import ElmModule.Init
 import ElmModule.Subscriptions
 import ElmModule.View
 import ElmModule.Update
 
-main : (Program Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
+main : (Program Shared.Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
 main =
    (Browser.element
       {
diff --git a/src/main-menu/src/Struct/Model.elm b/src/main-menu/src/Struct/Model.elm
index 747a39e..f7798a5 100644
--- a/src/main-menu/src/Struct/Model.elm
+++ b/src/main-menu/src/Struct/Model.elm
@@ -10,7 +10,7 @@ module Struct.Model exposing
 -- Elm -------------------------------------------------------------------------
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Main Menu -------------------------------------------------------------------
 import Struct.Error
@@ -22,7 +22,7 @@ import Struct.UI
 --------------------------------------------------------------------------------
 type alias Type =
    {
-      flags: Struct.Flags.Type,
+      flags: Shared.Struct.Flags.Type,
       error: (Maybe Struct.Error.Type),
       player_id: String,
       session_token: String,
@@ -37,7 +37,7 @@ type alias Type =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-new : Struct.Flags.Type -> Type
+new : Shared.Struct.Flags.Type -> Type
 new flags =
    {
       flags = flags,
diff --git a/src/main-menu/src/Update/HandleServerReply.elm b/src/main-menu/src/Update/HandleServerReply.elm
index 62f8005..52e8309 100644
--- a/src/main-menu/src/Update/HandleServerReply.elm
+++ b/src/main-menu/src/Update/HandleServerReply.elm
@@ -5,11 +5,11 @@ import Http
 import Url
 
 -- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
 
-import Struct.Flags
+import Shared.Struct.Flags
 
-import Util.Http
+import Shared.Util.Http
 
 -- Main Menu -------------------------------------------------------------------
 import Constants.IO
@@ -36,7 +36,7 @@ disconnected current_state =
       (
          model,
          [
-            (Action.Ports.go_to
+            (Shared.Action.Ports.go_to
                (
                   Constants.IO.base_url
                   ++ "/login/?action=disconnect&goto="
@@ -44,7 +44,8 @@ disconnected current_state =
                   (Url.percentEncode
                      (
                         "/main-menu/?"
-                        ++ (Struct.Flags.get_parameters_as_url model.flags)
+                        ++
+                        (Shared.Struct.Flags.get_parameters_as_url model.flags)
                      )
                   )
                )
@@ -86,7 +87,7 @@ apply_to model query_result =
          (
             (Struct.Model.invalidate
                (Struct.Error.new Struct.Error.Networking
-                  (Util.Http.error_to_string error)
+                  (Shared.Util.Http.error_to_string error)
                )
                model
             ),
diff --git a/src/map-editor/src/Comm/LoadMap.elm b/src/map-editor/src/Comm/LoadMap.elm
index e44612b..3f31595 100644
--- a/src/map-editor/src/Comm/LoadMap.elm
+++ b/src/map-editor/src/Comm/LoadMap.elm
@@ -4,7 +4,7 @@ module Comm.LoadMap exposing (try)
 import Json.Encode
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Comm.Send
@@ -28,12 +28,12 @@ maybe_encode model =
          [
             ("stk",
                (Json.Encode.string
-                  (Struct.Flags.get_session_token model.flags)
+                  (Shared.Struct.Flags.get_session_token model.flags)
                )
             ),
             ("pid",
                (Json.Encode.string
-                  (Struct.Flags.get_user_id model.flags)
+                  (Shared.Struct.Flags.get_user_id model.flags)
                )
             ),
             ("mid", (Json.Encode.string model.map_id))
diff --git a/src/map-editor/src/Comm/SendMapUpdate.elm b/src/map-editor/src/Comm/SendMapUpdate.elm
index 0dc65da..79091c3 100644
--- a/src/map-editor/src/Comm/SendMapUpdate.elm
+++ b/src/map-editor/src/Comm/SendMapUpdate.elm
@@ -6,7 +6,7 @@ import Array
 import Json.Encode
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.Map
@@ -34,12 +34,12 @@ encode_map model =
          [
             ("stk",
                (Json.Encode.string
-                  (Struct.Flags.get_session_token model.flags)
+                  (Shared.Struct.Flags.get_session_token model.flags)
                )
             ),
             ("pid",
                (Json.Encode.string
-                  (Struct.Flags.get_user_id model.flags)
+                  (Shared.Struct.Flags.get_user_id model.flags)
                )
             ),
             ("mid", (Json.Encode.string model.map_id)),
diff --git a/src/map-editor/src/ElmModule/Init.elm b/src/map-editor/src/ElmModule/Init.elm
index eb1fd2a..abb6d0f 100644
--- a/src/map-editor/src/ElmModule/Init.elm
+++ b/src/map-editor/src/ElmModule/Init.elm
@@ -1,7 +1,7 @@
 module ElmModule.Init exposing (init)
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Comm.LoadTilePatterns
@@ -18,7 +18,7 @@ import Struct.Model
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
+init : Shared.Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 init flags =
    let model = (Struct.Model.new flags) in
       (
diff --git a/src/map-editor/src/Main.elm b/src/map-editor/src/Main.elm
index 761cf4a..4c1615b 100644
--- a/src/map-editor/src/Main.elm
+++ b/src/map-editor/src/Main.elm
@@ -4,7 +4,7 @@ module Main exposing (main)
 import Browser
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Model
@@ -15,7 +15,7 @@ import ElmModule.Subscriptions
 import ElmModule.View
 import ElmModule.Update
 
-main : (Program Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
+main : (Program Shared.Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
 main =
    (Browser.element
       {
diff --git a/src/map-editor/src/Struct/Model.elm b/src/map-editor/src/Struct/Model.elm
index f0a8708..54b6e2c 100644
--- a/src/map-editor/src/Struct/Model.elm
+++ b/src/map-editor/src/Struct/Model.elm
@@ -12,7 +12,7 @@ module Struct.Model exposing
 import Dict
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Battle ----------------------------------------------------------------------
 import Battle.Struct.Omnimods
@@ -35,7 +35,7 @@ import Struct.UI
 --------------------------------------------------------------------------------
 type alias Type =
    {
-      flags : Struct.Flags.Type,
+      flags : Shared.Struct.Flags.Type,
       toolbox : Struct.Toolbox.Type,
       help_request : Struct.HelpRequest.Type,
       map : BattleMap.Struct.Map.Type,
@@ -59,10 +59,10 @@ type alias Type =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-new : Struct.Flags.Type -> Type
+new : Shared.Struct.Flags.Type -> Type
 new flags =
    let
-      maybe_map_id = (Struct.Flags.maybe_get_parameter "id" flags)
+      maybe_map_id = (Shared.Struct.Flags.maybe_get_parameter "id" flags)
       model =
          {
             flags = flags,
diff --git a/src/map-editor/src/Struct/Toolbox.elm b/src/map-editor/src/Struct/Toolbox.elm
index 3cec795..b66a5d4 100644
--- a/src/map-editor/src/Struct/Toolbox.elm
+++ b/src/map-editor/src/Struct/Toolbox.elm
@@ -21,7 +21,7 @@ module Struct.Toolbox exposing
    )
 
 -- Shared ----------------------------------------------------------------------
-import Util.List
+import Shared.Util.List
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.Location
@@ -112,7 +112,7 @@ get_filled_tiles_internals : (
       (List BattleMap.Struct.Location.Type)
    )
 get_filled_tiles_internals match_fun candidates result =
-   case (Util.List.pop candidates) of
+   case (Shared.Util.List.pop candidates) of
       Nothing -> result
       (Just (loc, remaining_candidates)) ->
          if (match_fun loc)
@@ -190,7 +190,11 @@ get_square_tiles corner map new_loc =
          then (List.range corner.y new_loc.y)
          else (List.range new_loc.y corner.y)
    in
-      (Util.List.product_map (BattleMap.Struct.Location.new) x_range y_range)
+      (Shared.Util.List.product_map
+         (BattleMap.Struct.Location.new)
+         x_range
+         y_range
+      )
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
diff --git a/src/map-editor/src/Update/GoToMainMenu.elm b/src/map-editor/src/Update/GoToMainMenu.elm
index c22e18e..3c7ca10 100644
--- a/src/map-editor/src/Update/GoToMainMenu.elm
+++ b/src/map-editor/src/Update/GoToMainMenu.elm
@@ -1,7 +1,7 @@
 module Update.GoToMainMenu exposing (apply_to)
 
 -- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
 
 -- Battle ----------------------------------------------------------------------
 import Constants.IO
@@ -20,5 +20,5 @@ apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 apply_to model =
    (
       model,
-      (Action.Ports.go_to (Constants.IO.base_url ++"/main-menu/"))
+      (Shared.Action.Ports.go_to (Constants.IO.base_url ++"/main-menu/"))
    )
diff --git a/src/map-editor/src/Update/HandleServerReply.elm b/src/map-editor/src/Update/HandleServerReply.elm
index 14feff8..026c092 100644
--- a/src/map-editor/src/Update/HandleServerReply.elm
+++ b/src/map-editor/src/Update/HandleServerReply.elm
@@ -6,11 +6,11 @@ import Http
 import Url
 
 -- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
 
-import Struct.Flags
+import Shared.Struct.Flags
 
-import Util.Http
+import Shared.Util.Http
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.Map
@@ -41,7 +41,7 @@ disconnected current_state =
       (
          model,
          [
-            (Action.Ports.go_to
+            (Shared.Action.Ports.go_to
                (
                   Constants.IO.base_url
                   ++ "/login/?action=disconnect&goto="
@@ -49,7 +49,8 @@ disconnected current_state =
                   (Url.percentEncode
                      (
                         "/map-editor/?"
-                        ++ (Struct.Flags.get_parameters_as_url model.flags)
+                        ++
+                        (Shared.Struct.Flags.get_parameters_as_url model.flags)
                      )
                   )
                )
@@ -144,7 +145,7 @@ apply_to model query_result =
             (Struct.Model.invalidate
                (Struct.Error.new
                   Struct.Error.Networking
-                  (Util.Http.error_to_string error)
+                  (Shared.Util.Http.error_to_string error)
                )
                model
             ),
diff --git a/src/map-editor/src/Update/PrettifySelectedTiles.elm b/src/map-editor/src/Update/PrettifySelectedTiles.elm
index c844ae2..74d9288 100644
--- a/src/map-editor/src/Update/PrettifySelectedTiles.elm
+++ b/src/map-editor/src/Update/PrettifySelectedTiles.elm
@@ -6,7 +6,7 @@ import Dict
 import Set
 
 -- Shared ----------------------------------------------------------------------
-import Util.List
+import Shared.Util.List
 
 -- Battle Map ------------------------------------------------------------------
 import BattleMap.Struct.Location
@@ -80,7 +80,7 @@ nigh_pattern_to_border model full_neighborhood nigh_pattern =
       case (Dict.get pattern model.tile_patterns) of
          Nothing ->
             case
-               (Util.List.get_first
+               (Shared.Util.List.get_first
                   (\e ->
                      (Struct.TilePattern.patterns_match
                         pattern
diff --git a/src/map-editor/src/View/SubMenu.elm b/src/map-editor/src/View/SubMenu.elm
index 8717ac0..29f1e72 100644
--- a/src/map-editor/src/View/SubMenu.elm
+++ b/src/map-editor/src/View/SubMenu.elm
@@ -5,7 +5,7 @@ import Html
 import Html.Attributes
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Event
@@ -52,4 +52,4 @@ get_html model =
          )
 
       Nothing ->
-         (Util.Html.nothing)
+         (Shared.Util.Html.nothing)
diff --git a/src/map-editor/src/View/SubMenu/TileStatus.elm b/src/map-editor/src/View/SubMenu/TileStatus.elm
index bc677f3..ef42163 100644
--- a/src/map-editor/src/View/SubMenu/TileStatus.elm
+++ b/src/map-editor/src/View/SubMenu/TileStatus.elm
@@ -7,7 +7,7 @@ import Html
 import Html.Attributes
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Battle ----------------------------------------------------------------------
 import Battle.View.Omnimods
diff --git a/src/roster-editor/src/Comm/JoinBattle.elm b/src/roster-editor/src/Comm/JoinBattle.elm
index f605ffc..f5ba678 100644
--- a/src/roster-editor/src/Comm/JoinBattle.elm
+++ b/src/roster-editor/src/Comm/JoinBattle.elm
@@ -6,7 +6,7 @@ import Array
 import Json.Encode
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Comm.Send
@@ -30,12 +30,12 @@ maybe_encode model =
          [
             ("stk",
                (Json.Encode.string
-                  (Struct.Flags.get_session_token model.flags)
+                  (Shared.Struct.Flags.get_session_token model.flags)
                )
             ),
             ("pid",
                (Json.Encode.string
-                  (Struct.Flags.get_user_id model.flags)
+                  (Shared.Struct.Flags.get_user_id model.flags)
                )
             ),
             (
@@ -44,7 +44,7 @@ maybe_encode model =
                   (
                      case
                         (String.toInt
-                           (Struct.Flags.force_get_parameter "six" model.flags)
+                           (Shared.Struct.Flags.force_get_parameter "six" model.flags)
                         )
                      of
                         (Just ix) -> ix
@@ -55,25 +55,25 @@ maybe_encode model =
             (
                "cat",
                (Json.Encode.string
-                  (Struct.Flags.force_get_parameter "cat" model.flags)
+                  (Shared.Struct.Flags.force_get_parameter "cat" model.flags)
                )
             ),
             (
                "mod",
                (Json.Encode.string
-                  (Struct.Flags.force_get_parameter "mod" model.flags)
+                  (Shared.Struct.Flags.force_get_parameter "mod" model.flags)
                )
             ),
             (
                "s",
                (Json.Encode.string
-                  (Struct.Flags.force_get_parameter "s" model.flags)
+                  (Shared.Struct.Flags.force_get_parameter "s" model.flags)
                )
             ),
             (
                "map_id",
                (Json.Encode.string
-                  (Struct.Flags.force_get_parameter "map_id" model.flags)
+                  (Shared.Struct.Flags.force_get_parameter "map_id" model.flags)
                )
             ),
             (
diff --git a/src/roster-editor/src/Comm/LoadRoster.elm b/src/roster-editor/src/Comm/LoadRoster.elm
index 5156826..a479e6d 100644
--- a/src/roster-editor/src/Comm/LoadRoster.elm
+++ b/src/roster-editor/src/Comm/LoadRoster.elm
@@ -4,7 +4,7 @@ module Comm.LoadRoster exposing (try)
 import Json.Encode
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Comm.Send
@@ -28,12 +28,12 @@ maybe_encode model =
          [
             ("stk",
                (Json.Encode.string
-                  (Struct.Flags.get_session_token model.flags)
+                  (Shared.Struct.Flags.get_session_token model.flags)
                )
             ),
             ("pid",
                (Json.Encode.string
-                  (Struct.Flags.get_user_id model.flags)
+                  (Shared.Struct.Flags.get_user_id model.flags)
                )
             ),
             ("rid", (Json.Encode.string model.roster_id))
diff --git a/src/roster-editor/src/Comm/Send.elm b/src/roster-editor/src/Comm/Send.elm
index f0d6387..d47df92 100644
--- a/src/roster-editor/src/Comm/Send.elm
+++ b/src/roster-editor/src/Comm/Send.elm
@@ -6,11 +6,13 @@ import Http
 import Json.Decode
 import Json.Encode
 
+--- Shared ---------------------------------------------------------------------
+import Shared.Comm.GoTo
+
 --- Battle Characters ----------------------------------------------------------
 import BattleCharacters.Comm.AddDataSetItem
 
 --- Local Module ---------------------------------------------------------------
-import Comm.GoTo
 import Comm.AddChar
 import Comm.SetInventory
 
@@ -33,7 +35,7 @@ internal_decoder reply_type =
       "add_char" -> (Comm.AddChar.decode)
 
       "disconnected" -> (Json.Decode.succeed Struct.ServerReply.Disconnected)
-      "goto" -> (Comm.GoTo.decode)
+      "goto" -> (Shared.Comm.GoTo.decode)
       "okay" -> (Json.Decode.succeed Struct.ServerReply.Okay)
 
       other ->
diff --git a/src/roster-editor/src/Comm/UpdateRoster.elm b/src/roster-editor/src/Comm/UpdateRoster.elm
index a6066a9..058a39e 100644
--- a/src/roster-editor/src/Comm/UpdateRoster.elm
+++ b/src/roster-editor/src/Comm/UpdateRoster.elm
@@ -8,7 +8,7 @@ import List
 import Json.Encode
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Comm.Send
@@ -33,12 +33,12 @@ maybe_encode model =
          [
             ("stk",
                (Json.Encode.string
-                  (Struct.Flags.get_session_token model.flags)
+                  (Shared.Struct.Flags.get_session_token model.flags)
                )
             ),
             ("pid",
                (Json.Encode.string
-                  (Struct.Flags.get_user_id model.flags)
+                  (Shared.Struct.Flags.get_user_id model.flags)
                )
             ),
             (
diff --git a/src/roster-editor/src/ElmModule/Init.elm b/src/roster-editor/src/ElmModule/Init.elm
index 2e72f49..16dfc72 100644
--- a/src/roster-editor/src/ElmModule/Init.elm
+++ b/src/roster-editor/src/ElmModule/Init.elm
@@ -1,7 +1,7 @@
 module ElmModule.Init exposing (init)
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Comm.LoadRoster
@@ -22,7 +22,7 @@ import Struct.Model
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-init : Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
+init : Shared.Struct.Flags.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 init flags =
    let model = (Struct.Model.new flags) in
       (
diff --git a/src/roster-editor/src/Main.elm b/src/roster-editor/src/Main.elm
index 9a8eeb7..f4a63bb 100644
--- a/src/roster-editor/src/Main.elm
+++ b/src/roster-editor/src/Main.elm
@@ -4,7 +4,7 @@ module Main exposing (main)
 import Browser
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Model
@@ -15,7 +15,7 @@ import ElmModule.Subscriptions
 import ElmModule.View
 import ElmModule.Update
 
-main : (Program Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
+main : (Program Shared.Struct.Flags.Type Struct.Model.Type Struct.Event.Type)
 main =
    (Browser.element
       {
diff --git a/src/roster-editor/src/Struct/Character.elm b/src/roster-editor/src/Struct/Character.elm
index d2dc129..ac516c1 100644
--- a/src/roster-editor/src/Struct/Character.elm
+++ b/src/roster-editor/src/Struct/Character.elm
@@ -32,7 +32,7 @@ import Json.Decode.Pipeline
 import Json.Encode
 
 -- Shared ----------------------------------------------------------------------
-import Util.List
+import Shared.Util.List
 
 -- Battle ----------------------------------------------------------------------
 import Battle.Struct.Attributes
@@ -99,7 +99,7 @@ compute_glyph_family_id_collections equipment =
          ),
          (Set.remove
             no_glyph_family_id
-            (Util.List.duplicates
+            (Shared.Util.List.duplicates
                family_ids_list
             )
          )
diff --git a/src/roster-editor/src/Struct/Model.elm b/src/roster-editor/src/Struct/Model.elm
index f661edf..174a6f2 100644
--- a/src/roster-editor/src/Struct/Model.elm
+++ b/src/roster-editor/src/Struct/Model.elm
@@ -19,9 +19,9 @@ import List
 import Dict
 
 -- Shared ----------------------------------------------------------------------
-import Struct.Flags
+import Shared.Struct.Flags
 
-import Util.Array
+import Shared.Util.Array
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.DataSet
@@ -39,7 +39,7 @@ import Struct.UI
 --------------------------------------------------------------------------------
 type alias Type =
    {
-      flags : Struct.Flags.Type,
+      flags : Shared.Struct.Flags.Type,
       error : (Maybe Struct.Error.Type),
       ui : Struct.UI.Type,
       help_request : Struct.HelpRequest.Type,
@@ -86,7 +86,7 @@ has_loaded_data model =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-new : Struct.Flags.Type -> Type
+new : Shared.Struct.Flags.Type -> Type
 new flags =
    {
       flags = flags,
@@ -98,7 +98,7 @@ new flags =
       battle_order =
          (Array.repeat
             (
-               case (Struct.Flags.maybe_get_parameter "s" flags) of
+               case (Shared.Struct.Flags.maybe_get_parameter "s" flags) of
                   Nothing -> 0
                   (Just "s") -> 8
                   (Just "m") -> 16
@@ -167,7 +167,7 @@ update_character_fun : (
    )
 update_character_fun ix fun model =
    {model |
-      characters = (Util.Array.update ix (fun) model.characters)
+      characters = (Shared.Util.Array.update ix (fun) model.characters)
    }
 
 invalidate : Struct.Error.Type -> Type -> Type
diff --git a/src/roster-editor/src/Update/GoToMainMenu.elm b/src/roster-editor/src/Update/GoToMainMenu.elm
index a0471f2..3819fd9 100644
--- a/src/roster-editor/src/Update/GoToMainMenu.elm
+++ b/src/roster-editor/src/Update/GoToMainMenu.elm
@@ -1,7 +1,7 @@
 module Update.GoToMainMenu exposing (apply_to)
 
 -- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
 
 -- Local Module ----------------------------------------------------------------
 import Constants.IO
@@ -20,5 +20,5 @@ apply_to : Struct.Model.Type -> (Struct.Model.Type, (Cmd Struct.Event.Type))
 apply_to model =
    (
       model,
-      (Action.Ports.go_to (Constants.IO.base_url ++"/main-menu/"))
+      (Shared.Action.Ports.go_to (Constants.IO.base_url ++"/main-menu/"))
    )
diff --git a/src/roster-editor/src/Update/HandleServerReply.elm b/src/roster-editor/src/Update/HandleServerReply.elm
index f456355..c85c44d 100644
--- a/src/roster-editor/src/Update/HandleServerReply.elm
+++ b/src/roster-editor/src/Update/HandleServerReply.elm
@@ -8,11 +8,11 @@ import Http
 import Url
 
 -- Shared ----------------------------------------------------------------------
-import Action.Ports
+import Shared.Action.Ports
 
-import Struct.Flags
+import Shared.Struct.Flags
 
-import Util.Http
+import Shared.Util.Http
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.DataSetItem
@@ -43,7 +43,7 @@ disconnected current_state =
       (
          model,
          [
-            (Action.Ports.go_to
+            (Shared.Action.Ports.go_to
                (
                   Constants.IO.base_url
                   ++ "/login/?action=disconnect&goto="
@@ -51,7 +51,7 @@ disconnected current_state =
                   (Url.percentEncode
                      (
                         "/roster-editor/?"
-                        ++ (Struct.Flags.get_parameters_as_url model.flags)
+                        ++ (Shared.Struct.Flags.get_parameters_as_url model.flags)
                      )
                   )
                )
@@ -69,7 +69,7 @@ goto url current_state =
       (
          model,
          [
-            (Action.Ports.go_to (Constants.IO.base_url ++ "/" ++ url))
+            (Shared.Action.Ports.go_to (Constants.IO.base_url ++ "/" ++ url))
          ]
       )
 
@@ -155,7 +155,7 @@ apply_to model query_result =
             (Struct.Model.invalidate
                (Struct.Error.new
                   Struct.Error.Networking
-                  (Util.Http.error_to_string error)
+                  (Shared.Util.Http.error_to_string error)
                )
                model
             ),
diff --git a/src/roster-editor/src/Update/ToggleBattleIndex.elm b/src/roster-editor/src/Update/ToggleBattleIndex.elm
index 27a61c3..81a9313 100644
--- a/src/roster-editor/src/Update/ToggleBattleIndex.elm
+++ b/src/roster-editor/src/Update/ToggleBattleIndex.elm
@@ -4,7 +4,7 @@ module Update.ToggleBattleIndex exposing (apply_to)
 import Array
 
 -- Shared ----------------------------------------------------------------------
-import Util.Array
+import Shared.Util.Array
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Character
@@ -44,7 +44,7 @@ give_battle_index : (
       Struct.Model.Type
    )
 give_battle_index model char index =
-   case (Util.Array.indexed_search (\e -> (e == -1)) model.battle_order) of
+   case (Shared.Util.Array.indexed_search (\e -> (e == -1)) model.battle_order) of
       Nothing -> model
       (Just (battle_index, _)) ->
          {model |
diff --git a/src/roster-editor/src/View/Character.elm b/src/roster-editor/src/View/Character.elm
index 1462b07..475cf9c 100644
--- a/src/roster-editor/src/View/Character.elm
+++ b/src/roster-editor/src/View/Character.elm
@@ -10,7 +10,7 @@ import Html.Attributes
 import Html.Events
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Battle Characters -----------------------------------------------------------
 import BattleCharacters.Struct.Armor
@@ -65,7 +65,7 @@ get_battle_index_html char =
    let battle_ix = (Struct.Character.get_battle_index char) in
       if (battle_ix == -1)
       then
-         (Util.Html.nothing)
+         (Shared.Util.Html.nothing)
       else
          (Html.div
             [
diff --git a/src/roster-editor/src/View/CharacterCard.elm b/src/roster-editor/src/View/CharacterCard.elm
index ab6590c..d394346 100644
--- a/src/roster-editor/src/View/CharacterCard.elm
+++ b/src/roster-editor/src/View/CharacterCard.elm
@@ -14,7 +14,7 @@ import Html.Attributes
 import Html.Events
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Battle ----------------------------------------------------------------------
 import Battle.Struct.Omnimods
@@ -161,7 +161,7 @@ get_weapon_field_header is_active_wp weapon =
                      (Html.text "(Equipped)")
                   ]
                )
-            else (Util.Html.nothing)
+            else (Shared.Util.Html.nothing)
          ),
          (Html.div
             [
@@ -238,7 +238,7 @@ get_weapon_details current_tab is_active_wp has_issue weapon =
                (Battle.View.Omnimods.get_signed_html
                   (BattleCharacters.Struct.Weapon.get_omnimods weapon)
                )
-            else (Util.Html.nothing)
+            else (Shared.Util.Html.nothing)
          )
       ]
    )
@@ -272,7 +272,7 @@ get_armor_details current_tab armor =
                (Battle.View.Omnimods.get_signed_html
                   (BattleCharacters.Struct.Armor.get_omnimods armor)
                )
-            else (Util.Html.nothing)
+            else (Shared.Util.Html.nothing)
          )
       ]
    )
diff --git a/src/roster-editor/src/View/Controlled.elm b/src/roster-editor/src/View/Controlled.elm
index 702c05f..159a1ee 100644
--- a/src/roster-editor/src/View/Controlled.elm
+++ b/src/roster-editor/src/View/Controlled.elm
@@ -6,7 +6,7 @@ import Html.Attributes
 import Html.Lazy
 
 -- Local Module ----------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Event
@@ -25,7 +25,7 @@ import View.CharacterCard
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    case model.edited_char of
-      Nothing -> (Util.Html.nothing)
+      Nothing -> (Shared.Util.Html.nothing)
       (Just char) ->
          (Html.div
             [(Html.Attributes.class "controlled")]
diff --git a/src/roster-editor/src/View/GlyphSelection.elm b/src/roster-editor/src/View/GlyphSelection.elm
index 8d4ef84..303c229 100644
--- a/src/roster-editor/src/View/GlyphSelection.elm
+++ b/src/roster-editor/src/View/GlyphSelection.elm
@@ -13,7 +13,7 @@ import Html.Attributes
 import Html.Events
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Battle ----------------------------------------------------------------------
 import Battle.Struct.Omnimods
@@ -97,7 +97,7 @@ true_get_html : (
    )
 true_get_html maybe_char glyph_modifier dataset =
    case maybe_char of
-      Nothing -> (Util.Html.nothing)
+      Nothing -> (Shared.Util.Html.nothing)
       (Just char) ->
          (Html.div
             [
diff --git a/src/roster-editor/src/View/MainMenu.elm b/src/roster-editor/src/View/MainMenu.elm
index 96a670a..b40d706 100644
--- a/src/roster-editor/src/View/MainMenu.elm
+++ b/src/roster-editor/src/View/MainMenu.elm
@@ -8,7 +8,7 @@ import Html.Attributes
 import Html.Events
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Local Module ----------------------------------------------------------------
 import Struct.Event
@@ -66,7 +66,7 @@ get_go_button_html model =
          ]
       )
    else
-      (Util.Html.nothing)
+      (Shared.Util.Html.nothing)
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
diff --git a/src/roster-editor/src/View/WeaponSelection.elm b/src/roster-editor/src/View/WeaponSelection.elm
index 830ec72..23a62c4 100644
--- a/src/roster-editor/src/View/WeaponSelection.elm
+++ b/src/roster-editor/src/View/WeaponSelection.elm
@@ -9,7 +9,7 @@ import Html.Attributes
 import Html.Events
 
 -- Shared ----------------------------------------------------------------------
-import Util.Html
+import Shared.Util.Html
 
 -- Battle ----------------------------------------------------------------------
 import Battle.View.Omnimods
@@ -148,7 +148,7 @@ true_get_html is_selecting_secondary dataset =
 get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
 get_html model =
    case model.edited_char of
-      Nothing -> (Util.Html.nothing)
+      Nothing -> (Shared.Util.Html.nothing)
       (Just char) ->
          let
             is_selecting_secondary =