12 files changed, 54 insertions, 29 deletions
diff --git a/src/battle/src/Comm/AddArmor.elm b/src/battle/src/Comm/AddArmor.elm
index 480b823..5dd7aad 100644
--- a/src/battle/src/Comm/AddArmor.elm
+++ b/src/battle/src/Comm/AddArmor.elm
@@ -3,8 +3,10 @@ module Comm.AddArmor exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------
-import Struct.Armor
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Armor
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -14,11 +16,15 @@ import Struct.ServerReply
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-internal_decoder : Struct.Armor.Type -> Struct.ServerReply.Type
+internal_decoder : BattleCharacters.Struct.Armor.Type -> Struct.ServerReply.Type
 internal_decoder ar = (Struct.ServerReply.AddArmor ar)
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode = (Json.Decode.map (internal_decoder) (Struct.Armor.decoder))
+decode =
+   (Json.Decode.map
+      (internal_decoder)
+      (BattleCharacters.Struct.Armor.decoder)
+   )
diff --git a/src/battle/src/Comm/AddChar.elm b/src/battle/src/Comm/AddChar.elm
index 9b36f69..9b63c6f 100644
--- a/src/battle/src/Comm/AddChar.elm
+++ b/src/battle/src/Comm/AddChar.elm
@@ -3,10 +3,8 @@ module Comm.AddChar exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.Character
-import Struct.Weapon
-import Struct.Armor
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
diff --git a/src/battle/src/Comm/AddPlayer.elm b/src/battle/src/Comm/AddPlayer.elm
index b902825..cd6fb6a 100644
--- a/src/battle/src/Comm/AddPlayer.elm
+++ b/src/battle/src/Comm/AddPlayer.elm
@@ -3,7 +3,7 @@ module Comm.AddPlayer exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battle ----------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.Player
 import Struct.ServerReply
 
diff --git a/src/battle/src/Comm/AddPortrait.elm b/src/battle/src/Comm/AddPortrait.elm
index 1cceb5f..321684c 100644
--- a/src/battle/src/Comm/AddPortrait.elm
+++ b/src/battle/src/Comm/AddPortrait.elm
@@ -1,10 +1,12 @@
-module Comm.AddPortrait exposing (decode)
+module BattleCharacters.Comm.AddPortrait exposing (decode)
 
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battle ----------------------------------------------------------------------
-import Struct.Portrait
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Portrait
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -14,11 +16,18 @@ import Struct.ServerReply
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-internal_decoder : Struct.Portrait.Type -> Struct.ServerReply.Type
+internal_decoder : (
+      BattleCharacters.Struct.Portrait.Type ->
+      Struct.ServerReply.Type
+   )
 internal_decoder pt = (Struct.ServerReply.AddPortrait pt)
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode = (Json.Decode.map (internal_decoder) (Struct.Portrait.decoder))
+decode =
+   (Json.Decode.map
+      (internal_decoder)
+      (BattleCharacters.Struct.Portrait.decoder)
+   )
diff --git a/src/battle/src/Comm/AddTile.elm b/src/battle/src/Comm/AddTile.elm
index 64cf0ea..6b27310 100644
--- a/src/battle/src/Comm/AddTile.elm
+++ b/src/battle/src/Comm/AddTile.elm
@@ -3,8 +3,10 @@ module Comm.AddTile exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------
-import Struct.Tile
+-- Battle Map ------------------------------------------------------------------
+import BattleMap.Struct.Tile
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -21,4 +23,4 @@ internal_decoder wp = (Struct.ServerReply.AddTile wp)
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode = (Json.Decode.map (internal_decoder) (Struct.Tile.decoder))
+decode = (Json.Decode.map (internal_decoder) (BattleMap.Struct.Tile.decoder))
diff --git a/src/battle/src/Comm/AddWeapon.elm b/src/battle/src/Comm/AddWeapon.elm
index 7061dea..307dc6a 100644
--- a/src/battle/src/Comm/AddWeapon.elm
+++ b/src/battle/src/Comm/AddWeapon.elm
@@ -3,8 +3,10 @@ module Comm.AddWeapon exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------
-import Struct.Weapon
+-- Battle Characters -----------------------------------------------------------
+import BattleCharacters.Struct.Weapon
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -14,11 +16,18 @@ import Struct.ServerReply
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-internal_decoder : Struct.Weapon.Type -> Struct.ServerReply.Type
+internal_decoder : (
+      BattleCharacters.Struct.Weapon.Type ->
+      Struct.ServerReply.Type
+   )
 internal_decoder wp = (Struct.ServerReply.AddWeapon wp)
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode = (Json.Decode.map (internal_decoder) (Struct.Weapon.decoder))
+decode =
+   (Json.Decode.map
+      (internal_decoder)
+      (BattleCharacters.Struct.Weapon.decoder)
+   )
diff --git a/src/battle/src/Comm/CharacterTurn.elm b/src/battle/src/Comm/CharacterTurn.elm
index 7809b00..6e3612f 100644
--- a/src/battle/src/Comm/CharacterTurn.elm
+++ b/src/battle/src/Comm/CharacterTurn.elm
@@ -3,14 +3,13 @@ module Comm.CharacterTurn exposing (try)
 -- Elm -------------------------------------------------------------------------
 import Json.Encode
 
--- Map -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Constants.IO
 
 import Comm.Send
 
 import Struct.Character
 import Struct.CharacterTurn
-import Struct.Direction
 import Struct.Event
 import Struct.Model
 
diff --git a/src/battle/src/Comm/LoadBattle.elm b/src/battle/src/Comm/LoadBattle.elm
index df4e9dd..78a337f 100644
--- a/src/battle/src/Comm/LoadBattle.elm
+++ b/src/battle/src/Comm/LoadBattle.elm
@@ -3,7 +3,7 @@ module Comm.LoadBattle exposing (try)
 -- Elm -------------------------------------------------------------------------
 import Json.Encode
 
--- Map -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Comm.Send
 
 import Constants.IO
diff --git a/src/battle/src/Comm/Send.elm b/src/battle/src/Comm/Send.elm
index 68dda5d..3394b26 100644
--- a/src/battle/src/Comm/Send.elm
+++ b/src/battle/src/Comm/Send.elm
@@ -6,7 +6,7 @@ import Http
 import Json.Decode
 import Json.Encode
 
--- Battle ----------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Comm.AddArmor
 import Comm.AddPortrait
 import Comm.AddPlayer
diff --git a/src/battle/src/Comm/SetMap.elm b/src/battle/src/Comm/SetMap.elm
index 10d527a..80f6db1 100644
--- a/src/battle/src/Comm/SetMap.elm
+++ b/src/battle/src/Comm/SetMap.elm
@@ -3,8 +3,10 @@ module Comm.SetMap exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------------
-import Struct.Map
+-- Battle Map ------------------------------------------------------------------
+import BattleMap.Struct.Map
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -22,5 +24,5 @@ decode : (Json.Decode.Decoder Struct.ServerReply.Type)
 decode =
    (Json.Decode.map
       (\map -> (Struct.ServerReply.SetMap map))
-      (Struct.Map.decoder)
+      (BattleMap.Struct.Map.decoder)
    )
diff --git a/src/battle/src/Comm/SetTimeline.elm b/src/battle/src/Comm/SetTimeline.elm
index 3956ec3..865a575 100644
--- a/src/battle/src/Comm/SetTimeline.elm
+++ b/src/battle/src/Comm/SetTimeline.elm
@@ -3,7 +3,7 @@ module Comm.SetTimeline exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 import Struct.TurnResult
 
diff --git a/src/battle/src/Comm/TurnResults.elm b/src/battle/src/Comm/TurnResults.elm
index f8727e1..09fbc55 100644
--- a/src/battle/src/Comm/TurnResults.elm
+++ b/src/battle/src/Comm/TurnResults.elm
@@ -3,7 +3,7 @@ module Comm.TurnResults exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 import Struct.TurnResult