...

5 files changed, 47 insertions, 53 deletions

diff --git a/src/battlemap/src/Main.elm b/src/battlemap/src/Main.elm
index 5a9d843..96b267f 100644
--- a/src/battlemap/src/Main.elm
+++ b/src/battlemap/src/Main.elm
@@ -1,20 +1,22 @@
+-- Elm ------------------------------------------------------------------------
 import Html
 
-import Model
-import Event
+-- Battlemap -------------------------------------------------------------------
+import Struct.Model
+import Struct.Event
 
-import Init
-import Subscriptions
-import View
-import Update
+import ElmModule.Init
+import ElmModule.Subscriptions
+import ElmModule.View
+import ElmModule.Update
 
-main : (Program Never Model.Type Event.Type)
+main : (Program Never Struct.Model.Type Struct.Event.Type)
 main =
    (Html.program
       {
-         init = Init.init,
-         view = View.view,
-         update = Update.update,
-         subscriptions = Subscriptions.subscriptions
+         init = ElmModule.Init.init,
+         view = ElmModule.View.view,
+         update = ElmModule.Update.update,
+         subscriptions = ElmModule.Subscriptions.subscriptions
       }
    )
diff --git a/src/battlemap/src/Send/CharacterTurn.elm b/src/battlemap/src/Send/CharacterTurn.elm
index d096ac3..f7cf1c9 100644
--- a/src/battlemap/src/Send/CharacterTurn.elm
+++ b/src/battlemap/src/Send/CharacterTurn.elm
@@ -4,17 +4,16 @@ module Send.CharacterTurn exposing (try)
 import Json.Encode
 
 -- Battlemap -------------------------------------------------------------------
-import Battlemap
-import Battlemap.Direction
-
-import UI
+import Struct.Battlemap
+import Struct.Direction
+import Struct.UI
+import Struct.Event
+import Struct.Model
 
 import Constants.IO
-import Event
-
-import Model
 
 import Send
+
 --------------------------------------------------------------------------------
 -- TYPES ------------------------------------------------------------------------
 --------------------------------------------------------------------------------
@@ -22,7 +21,7 @@ import Send
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-try_encoding : Model.Type -> (Maybe Json.Encode.Value)
+try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value)
 try_encoding model =
    case model.controlled_character of
       (Just char_ref) ->
@@ -41,10 +40,10 @@ try_encoding model =
                            (
                               (Json.Encode.string)
                               <<
-                              (Battlemap.Direction.to_string)
+                              (Struct.Direction.to_string)
                            )
                            (List.reverse
-                              (Battlemap.get_navigator_path model.battlemap)
+                              (Struct.Battlemap.get_navigator_path model.battlemap)
                            )
                         )
                      )
@@ -65,6 +64,6 @@ try_encoding model =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-try : Model.Type -> (Maybe (Cmd Event.Type))
+try : Struct.Model.Type -> (Maybe (Cmd Struct.Event.Type))
 try model =
    (Send.try_sending model Constants.IO.character_turn_handler try_encoding)
diff --git a/src/battlemap/src/Send/LoadBattlemap.elm b/src/battlemap/src/Send/LoadBattlemap.elm
index b81ba00..08bff57 100644
--- a/src/battlemap/src/Send/LoadBattlemap.elm
+++ b/src/battlemap/src/Send/LoadBattlemap.elm
@@ -4,14 +4,13 @@ module Send.LoadBattlemap exposing (try)
 import Json.Encode
 
 -- Battlemap -------------------------------------------------------------------
-import Constants.IO
+import Struct.Model
+import Struct.Event
 
-import Model
+import Constants.IO
 
 import Send
 
-import Event
-
 --------------------------------------------------------------------------------
 -- TYPES ------------------------------------------------------------------------
 --------------------------------------------------------------------------------
@@ -19,7 +18,7 @@ import Event
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-try_encoding : Model.Type -> (Maybe Json.Encode.Value)
+try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value)
 try_encoding model =
    (Just
       (Json.Encode.object
diff --git a/src/battlemap/src/Send/Send.elm b/src/battlemap/src/Send/Send.elm
index 3288050..ec14ce6 100644
--- a/src/battlemap/src/Send/Send.elm
+++ b/src/battlemap/src/Send/Send.elm
@@ -7,9 +7,8 @@ import Json.Encode
 import Http
 
 -- Battlemap -------------------------------------------------------------------
-import Model
-
-import Event
+import Struct.Model
+import Struct.Event
 
 --------------------------------------------------------------------------------
 -- TYPES -----------------------------------------------------------------------
@@ -26,19 +25,18 @@ decoder =
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-
 try_sending : (
-      Model.Type ->
+      Struct.Model.Type ->
       String ->
-      (Model.Type -> (Maybe Json.Encode.Value)) ->
-      (Maybe (Cmd Event.Type))
+      (Struct.Model.Type -> (Maybe Json.Encode.Value)) ->
+      (Maybe (Cmd Struct.Event.Type))
    )
 try_sending model recipient try_encoding_fun =
    case (try_encoding_fun model) of
       (Just serial) ->
          (Just
             (Http.send
-               Event.ServerReplied
+               Struct.Event.ServerReplied
                (Http.post
                   recipient
                   (Http.jsonBody serial)
diff --git a/src/battlemap/src/Send/Query/CharacterTurn.elm b/src/battlemap/src/Struct/CharacterTurn.elm
index ec7efa0..f234184 100644
--- a/src/battlemap/src/Send/Query/CharacterTurn.elm
+++ b/src/battlemap/src/Struct/CharacterTurn.elm
@@ -1,4 +1,4 @@
-module Query.CharacterTurn exposing
+module Struct.CharacterTurn exposing
    (
       Type,
       State(..),
@@ -17,14 +17,10 @@ module Query.CharacterTurn exposing
 import List
 
 -- Battlemap -------------------------------------------------------------------
-import Battlemap
-import Battlemap.Direction
-
-import UI
-
-import Error
-
-import Character
+import Struct.Battlemap
+import Struct.Character
+import Struct.Direction
+import Struct.Error
 
 --------------------------------------------------------------------------------
 -- TYPES -----------------------------------------------------------------------
@@ -38,9 +34,9 @@ type State =
 type alias Type =
    {
       state : State,
-      controlled_character : (Maybe Character.Ref),
-      path : (List Battlemap.Direction.Type),
-      targets : (List Character.Ref)
+      controlled_character : (Maybe Struct.Character.Ref),
+      path : (List Struct.Direction.Type),
+      targets : (List Struct.Character.Ref)
    }
 
 --------------------------------------------------------------------------------
@@ -59,10 +55,10 @@ new =
       targets = []
    }
 
-try_getting_controlled_character : Type -> (Maybe Character.Ref)
+try_getting_controlled_character : Type -> (Maybe Struct.Character.Ref)
 try_getting_controlled_character ct = ct.controlled_character
 
-set_controlled_character : Type -> Character.Ref -> Type
+set_controlled_character : Type -> Struct.Character.Ref -> Type
 set_controlled_character ct char_ref =
    {
       state = SelectedCharacter,
@@ -74,10 +70,10 @@ set_controlled_character ct char_ref =
 get_state : Type -> State
 get_state ct = ct.state
 
-get_path : Type -> (List Battlemap.Direction.Type)
+get_path : Type -> (List Struct.Direction.Type)
 get_path ct = ct.path
 
-set_path : Type -> (List Battlemap.Direction.Type) -> Type
+set_path : Type -> (List Struct.Direction.Type) -> Type
 set_path ct path =
    {ct |
       state = MovedCharacter,
@@ -85,7 +81,7 @@ set_path ct path =
       targets = []
    }
 
-add_target : Type -> Character.Ref -> Type
+add_target : Type -> Struct.Character.Ref -> Type
 add_target ct target_ref =
    {ct |
       state = ChoseTarget,
@@ -111,5 +107,5 @@ remove_target ct i =
                targets = new_targets
             }
 
-get_targets : Type -> (List Character.Ref)
+get_targets : Type -> (List Struct.Character.Ref)
 get_targets ct = ct.targets