51 files changed, 238 insertions, 283 deletions

diff --git a/android/assets/images/map_a.png b/android/assets/data/map_a.png
index 0eb51d3..0eb51d3 100644
--- a/android/assets/images/map_a.png
+++ b/android/assets/data/map_a.png
diff --git a/android/assets/images/map_b.png b/android/assets/data/map_b.png
index 20a0fec..20a0fec 100644
--- a/android/assets/images/map_b.png
+++ b/android/assets/data/map_b.png
diff --git a/android/assets/data/pawns.atlas b/android/assets/data/pawns.atlas
new file mode 100644
index 0000000..465dc19
--- /dev/null
+++ b/android/assets/data/pawns.atlas
@@ -0,0 +1,236 @@
+
+pawns.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+01_fog
+  rotate: false
+  xy: 2, 539
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+02_blue
+  rotate: false
+  xy: 234, 781
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+03_green
+  rotate: false
+  xy: 2, 320
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+04_red
+  rotate: false
+  xy: 426, 781
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+05_move
+  rotate: false
+  xy: 2, 101
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+06_rose
+  rotate: false
+  xy: 2, 758
+  size: 230, 240
+  orig: 230, 240
+  offset: 0, 0
+  index: -1
+ace
+  rotate: false
+  xy: 194, 632
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap1
+  rotate: false
+  xy: 194, 506
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap2
+  rotate: false
+  xy: 194, 380
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap3
+  rotate: false
+  xy: 194, 254
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap4
+  rotate: false
+  xy: 194, 128
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap_spent
+  rotate: false
+  xy: 320, 655
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+back
+  rotate: false
+  xy: 320, 529
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+disabled
+  rotate: false
+  xy: 446, 655
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-at-gun
+  rotate: false
+  xy: 320, 403
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-infantry
+  rotate: false
+  xy: 446, 529
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-kingtiger
+  rotate: false
+  xy: 572, 655
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-panzer-iv
+  rotate: false
+  xy: 446, 403
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-panzer-iv-hq
+  rotate: false
+  xy: 320, 277
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-tiger
+  rotate: false
+  xy: 572, 529
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-wespe
+  rotate: false
+  xy: 320, 151
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+head
+  rotate: false
+  xy: 810, 823
+  size: 175, 175
+  orig: 175, 175
+  offset: 0, 0
+  index: -1
+turn_back
+  rotate: false
+  xy: 446, 277
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+turn_front
+  rotate: false
+  xy: 572, 403
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-at-gun
+  rotate: false
+  xy: 446, 151
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-infantry
+  rotate: false
+  xy: 572, 277
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-pershing
+  rotate: false
+  xy: 194, 2
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-pershing-hq
+  rotate: false
+  xy: 572, 151
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-priest
+  rotate: false
+  xy: 320, 25
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-sherman
+  rotate: false
+  xy: 618, 781
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+us-sherman-head
+  rotate: false
+  xy: 810, 671
+  size: 150, 150
+  orig: 150, 150
+  offset: 0, 0
+  index: -1
+us-sherman-hq
+  rotate: false
+  xy: 446, 25
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-wolverine
+  rotate: false
+  xy: 572, 25
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/data/pawns.png b/android/assets/data/pawns.png
new file mode 100644
index 0000000..5accec8
--- /dev/null
+++ b/android/assets/data/pawns.png
diff --git a/android/assets/images/counters.atlas b/android/assets/images/counters.atlas
deleted file mode 100644
index f022234..0000000
--- a/android/assets/images/counters.atlas
+++ /dev/null
@@ -1,75 +0,0 @@
-
-counters.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-ace
-  rotate: false
-  xy: 2, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap1
-  rotate: false
-  xy: 2, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap2
-  rotate: false
-  xy: 128, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap3
-  rotate: false
-  xy: 128, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap4
-  rotate: false
-  xy: 254, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap_spent
-  rotate: false
-  xy: 254, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-back
-  rotate: false
-  xy: 380, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-move
-  rotate: false
-  xy: 380, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-turn_back
-  rotate: false
-  xy: 506, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-turn_front
-  rotate: false
-  xy: 506, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/images/counters.png b/android/assets/images/counters.png
deleted file mode 100644
index 88feeb9..0000000
--- a/android/assets/images/counters.png
+++ /dev/null
diff --git a/android/assets/images/ge.atlas b/android/assets/images/ge.atlas
deleted file mode 100644
index 2d9bae0..0000000
--- a/android/assets/images/ge.atlas
+++ /dev/null
@@ -1,61 +0,0 @@
-
-ge.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-at-gun
-  rotate: false
-  xy: 179, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 2, 77
-  size: 175, 175
-  orig: 175, 175
-  offset: 0, 0
-  index: -1
-infantry
-  rotate: false
-  xy: 305, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-kingtiger
-  rotate: false
-  xy: 431, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-panzer-iv
-  rotate: false
-  xy: 683, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-panzer-iv-hq
-  rotate: false
-  xy: 557, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-tiger
-  rotate: false
-  xy: 809, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-wespe
-  rotate: false
-  xy: 179, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/images/ge.png b/android/assets/images/ge.png
deleted file mode 100644
index b4c0243..0000000
--- a/android/assets/images/ge.png
+++ /dev/null
diff --git a/android/assets/images/hex.atlas b/android/assets/images/hex.atlas
deleted file mode 100644
index ede214a..0000000
--- a/android/assets/images/hex.atlas
+++ /dev/null
@@ -1,54 +0,0 @@
-
-hex.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-01_fog
-  rotate: false
-  xy: 2, 2
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-02_blue
-  rotate: false
-  xy: 234, 244
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-03_green
-  rotate: false
-  xy: 426, 244
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-04_red
-  rotate: false
-  xy: 618, 244
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-05_dot
-  rotate: false
-  xy: 810, 244
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-06_move
-  rotate: false
-  xy: 194, 2
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-07_rose
-  rotate: false
-  xy: 2, 221
-  size: 230, 240
-  orig: 230, 240
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/images/hex.png b/android/assets/images/hex.png
deleted file mode 100644
index 828e726..0000000
--- a/android/assets/images/hex.png
+++ /dev/null
diff --git a/android/assets/images/unit.atlas b/android/assets/images/unit.atlas
deleted file mode 100644
index bb2270d..0000000
--- a/android/assets/images/unit.atlas
+++ /dev/null
@@ -1,12 +0,0 @@
-
-unit.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-disabled
-  rotate: false
-  xy: 2, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/images/unit.png b/android/assets/images/unit.png
deleted file mode 100644
index e3128dc..0000000
--- a/android/assets/images/unit.png
+++ /dev/null
diff --git a/android/assets/images/us.atlas b/android/assets/images/us.atlas
deleted file mode 100644
index 9f7f164..0000000
--- a/android/assets/images/us.atlas
+++ /dev/null
@@ -1,75 +0,0 @@
-
-us.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-at-gun
-  rotate: false
-  xy: 346, 280
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 2, 10
-  size: 175, 175
-  orig: 175, 175
-  offset: 0, 0
-  index: -1
-infantry
-  rotate: false
-  xy: 472, 280
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-pershing
-  rotate: false
-  xy: 724, 280
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-pershing-hq
-  rotate: false
-  xy: 598, 280
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-priest
-  rotate: false
-  xy: 850, 280
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-sherman
-  rotate: false
-  xy: 2, 187
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-sherman-head
-  rotate: false
-  xy: 194, 254
-  size: 150, 150
-  orig: 150, 150
-  offset: 0, 0
-  index: -1
-sherman-hq
-  rotate: false
-  xy: 194, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-wolverine
-  rotate: false
-  xy: 179, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/images/us.png b/android/assets/images/us.png
deleted file mode 100644
index 5fe8f07..0000000
--- a/android/assets/images/us.png
+++ /dev/null
diff --git a/build.gradle b/build.gradle
index a354fe6..d59cbc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,13 +36,9 @@ allprojects {
 
     task packs(type: com.eowise.packer.Packer) {
         resourcesInputPath 'data'
-        atlasesOutputPath 'android/assets/images/'
+        atlasesOutputPath 'android/assets/data/'
         atlases {
-            add 'us'
-            add 'ge'
-            add 'hex'
-            add 'unit'
-            add 'counters'
+            add 'pawns'
         }
     }
 }
diff --git a/data/counters/move.png b/data/counters/move.png
deleted file mode 100644
index aaa0f98..0000000
--- a/data/counters/move.png
+++ /dev/null
diff --git a/data/ge/head.png b/data/ge/head.png
deleted file mode 100644
index 88787d4..0000000
--- a/data/ge/head.png
+++ /dev/null
diff --git a/data/hex/05_dot.png b/data/hex/05_dot.png
deleted file mode 100644
index 6c3a53c..0000000
--- a/data/hex/05_dot.png
+++ /dev/null
diff --git a/data/hex/01_fog.png b/data/pawns/01_fog.png
index 7d85d98..7d85d98 100644
--- a/data/hex/01_fog.png
+++ b/data/pawns/01_fog.png
diff --git a/data/hex/02_blue.png b/data/pawns/02_blue.png
index 12fcba8..12fcba8 100644
--- a/data/hex/02_blue.png
+++ b/data/pawns/02_blue.png
diff --git a/data/hex/03_green.png b/data/pawns/03_green.png
index 78b8f75..78b8f75 100644
--- a/data/hex/03_green.png
+++ b/data/pawns/03_green.png
diff --git a/data/hex/04_red.png b/data/pawns/04_red.png
index 1320f4a..1320f4a 100644
--- a/data/hex/04_red.png
+++ b/data/pawns/04_red.png
diff --git a/data/hex/06_move.png b/data/pawns/05_move.png
index e0204a9..e0204a9 100644
--- a/data/hex/06_move.png
+++ b/data/pawns/05_move.png
diff --git a/data/hex/07_rose.png b/data/pawns/06_rose.png
index fd9c7b7..fd9c7b7 100644
--- a/data/hex/07_rose.png
+++ b/data/pawns/06_rose.png
diff --git a/data/counters/ace.png b/data/pawns/ace.png
index f4f3240..f4f3240 100644
--- a/data/counters/ace.png
+++ b/data/pawns/ace.png
diff --git a/data/counters/ap1.png b/data/pawns/ap1.png
index c47d15e..c47d15e 100644
--- a/data/counters/ap1.png
+++ b/data/pawns/ap1.png
diff --git a/data/counters/ap2.png b/data/pawns/ap2.png
index e89956a..e89956a 100644
--- a/data/counters/ap2.png
+++ b/data/pawns/ap2.png
diff --git a/data/counters/ap3.png b/data/pawns/ap3.png
index 7d1b11f..7d1b11f 100644
--- a/data/counters/ap3.png
+++ b/data/pawns/ap3.png
diff --git a/data/counters/ap4.png b/data/pawns/ap4.png
index e897628..e897628 100644
--- a/data/counters/ap4.png
+++ b/data/pawns/ap4.png
diff --git a/data/counters/ap_spent.png b/data/pawns/ap_spent.png
index cb399d8..cb399d8 100644
--- a/data/counters/ap_spent.png
+++ b/data/pawns/ap_spent.png
diff --git a/data/counters/back.png b/data/pawns/back.png
index e7eb5ef..e7eb5ef 100644
--- a/data/counters/back.png
+++ b/data/pawns/back.png
diff --git a/data/unit/disabled.png b/data/pawns/disabled.png
index a5ad3d3..a5ad3d3 100644
--- a/data/unit/disabled.png
+++ b/data/pawns/disabled.png
diff --git a/data/ge/at-gun.png b/data/pawns/ge-at-gun.png
index f81a4b1..f81a4b1 100644
--- a/data/ge/at-gun.png
+++ b/data/pawns/ge-at-gun.png
diff --git a/data/ge/infantry.png b/data/pawns/ge-infantry.png
index ef4cee9..ef4cee9 100644
--- a/data/ge/infantry.png
+++ b/data/pawns/ge-infantry.png
diff --git a/data/ge/kingtiger.png b/data/pawns/ge-kingtiger.png
index e45171b..e45171b 100644
--- a/data/ge/kingtiger.png
+++ b/data/pawns/ge-kingtiger.png
diff --git a/data/ge/panzer-iv-hq.png b/data/pawns/ge-panzer-iv-hq.png
index 2785941..2785941 100644
--- a/data/ge/panzer-iv-hq.png
+++ b/data/pawns/ge-panzer-iv-hq.png
diff --git a/data/ge/panzer-iv.png b/data/pawns/ge-panzer-iv.png
index 35ab9c3..35ab9c3 100644
--- a/data/ge/panzer-iv.png
+++ b/data/pawns/ge-panzer-iv.png
diff --git a/data/ge/tiger.png b/data/pawns/ge-tiger.png
index 72e7b6c..72e7b6c 100644
--- a/data/ge/tiger.png
+++ b/data/pawns/ge-tiger.png
diff --git a/data/ge/wespe.png b/data/pawns/ge-wespe.png
index 566e5b3..566e5b3 100644
--- a/data/ge/wespe.png
+++ b/data/pawns/ge-wespe.png
diff --git a/data/us/head.png b/data/pawns/head.png
index a79a840..a79a840 100644
--- a/data/us/head.png
+++ b/data/pawns/head.png
diff --git a/data/counters/turn_back.png b/data/pawns/turn_back.png
index 3f681d8..3f681d8 100644
--- a/data/counters/turn_back.png
+++ b/data/pawns/turn_back.png
diff --git a/data/counters/turn_front.png b/data/pawns/turn_front.png
index b08806b..b08806b 100644
--- a/data/counters/turn_front.png
+++ b/data/pawns/turn_front.png
diff --git a/data/us/at-gun.png b/data/pawns/us-at-gun.png
index 9991ecf..9991ecf 100644
--- a/data/us/at-gun.png
+++ b/data/pawns/us-at-gun.png
diff --git a/data/us/infantry.png b/data/pawns/us-infantry.png
index 9cea3c2..9cea3c2 100644
--- a/data/us/infantry.png
+++ b/data/pawns/us-infantry.png
diff --git a/data/us/pershing-hq.png b/data/pawns/us-pershing-hq.png
index 10b9364..10b9364 100644
--- a/data/us/pershing-hq.png
+++ b/data/pawns/us-pershing-hq.png
diff --git a/data/us/pershing.png b/data/pawns/us-pershing.png
index 605563f..605563f 100644
--- a/data/us/pershing.png
+++ b/data/pawns/us-pershing.png
diff --git a/data/us/priest.png b/data/pawns/us-priest.png
index 0dd6623..0dd6623 100644
--- a/data/us/priest.png
+++ b/data/pawns/us-priest.png
diff --git a/data/us/sherman-head.png b/data/pawns/us-sherman-head.png
index 62a390e..62a390e 100644
--- a/data/us/sherman-head.png
+++ b/data/pawns/us-sherman-head.png
diff --git a/data/us/sherman-hq.png b/data/pawns/us-sherman-hq.png
index bf54ea6..bf54ea6 100644
--- a/data/us/sherman-hq.png
+++ b/data/pawns/us-sherman-hq.png
diff --git a/data/us/sherman.png b/data/pawns/us-sherman.png
index cd5cc8f..cd5cc8f 100644
--- a/data/us/sherman.png
+++ b/data/pawns/us-sherman.png
diff --git a/data/us/wolverine.png b/data/pawns/us-wolverine.png
index 9ce6dc3..9ce6dc3 100644
--- a/data/us/wolverine.png
+++ b/data/pawns/us-wolverine.png