diff --git a/map1.png b/map1.png
deleted file mode 100755
index 6e9ba2e..0000000
Binary files a/map1.png and /dev/null differ
diff --git a/public/damage_block.css b/public/assets/css/damage_block.css
similarity index 100%
rename from public/damage_block.css
rename to public/assets/css/damage_block.css
diff --git a/public/map.css b/public/assets/css/map.css
similarity index 100%
rename from public/map.css
rename to public/assets/css/map.css
diff --git a/public/soldier_record_block.css b/public/assets/css/soldier_record_block.css
similarity index 100%
rename from public/soldier_record_block.css
rename to public/assets/css/soldier_record_block.css
diff --git a/public/style.css b/public/assets/css/style.css
similarity index 100%
rename from public/style.css
rename to public/assets/css/style.css
diff --git a/public/column.jpg b/public/assets/images/column.jpg
similarity index 100%
rename from public/column.jpg
rename to public/assets/images/column.jpg
diff --git a/public/counter_grenade.jpg b/public/assets/images/counter_grenade.jpg
similarity index 100%
rename from public/counter_grenade.jpg
rename to public/assets/images/counter_grenade.jpg
diff --git a/public/counter_prone.jpg b/public/assets/images/counter_prone.jpg
similarity index 100%
rename from public/counter_prone.jpg
rename to public/assets/images/counter_prone.jpg
diff --git a/firing_arc_large.png b/public/assets/images/firing_arc_large.png
similarity index 100%
rename from firing_arc_large.png
rename to public/assets/images/firing_arc_large.png
diff --git a/firing_arc_medium.png b/public/assets/images/firing_arc_medium.png
similarity index 100%
rename from firing_arc_medium.png
rename to public/assets/images/firing_arc_medium.png
diff --git a/firing_arc_small.png b/public/assets/images/firing_arc_small.png
similarity index 100%
rename from firing_arc_small.png
rename to public/assets/images/firing_arc_small.png
diff --git a/public/icon_grenade.png b/public/assets/images/icon_grenade.png
similarity index 100%
rename from public/icon_grenade.png
rename to public/assets/images/icon_grenade.png
diff --git a/logo-davion.png b/public/assets/images/logo-davion.png
similarity index 100%
rename from logo-davion.png
rename to public/assets/images/logo-davion.png
diff --git a/logo-liao.png b/public/assets/images/logo-liao.png
similarity index 100%
rename from logo-liao.png
rename to public/assets/images/logo-liao.png
diff --git a/public/map1.svg b/public/assets/images/map1.svg
similarity index 99%
rename from public/map1.svg
rename to public/assets/images/map1.svg
index 6d767ba..fe64a5e 100644
--- a/public/map1.svg
+++ b/public/assets/images/map1.svg
@@ -2,17 +2,12 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg viewBox="-18 -150 2320 3360" xmlns="http://www.w3.org/2000/svg">
-  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="map.css" type="text/css"/>
+  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="../css/map.css" type="text/css"/>
   <style>
     g[data-edge="north"] { --i: -2; }
     g[data-edge="south"] { --i: 52; }
   </style>
   <defs>
-    <!-- <g id="hex">
-      <polygon points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
-      <circle cx="0" cy="0" r="1" fill="black"/>
-    </g> -->
-
     <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
 
     <circle id="counter-base" cx="0" cy="0" r="5"/>
@@ -1919,5 +1914,5 @@
       </g>
     </g>
   </g>
-  <script href="map.js"></script>
+  <script href="../../map.js"></script>
 </svg>
diff --git a/public/map2.svg b/public/assets/images/map2.svg
similarity index 97%
rename from public/map2.svg
rename to public/assets/images/map2.svg
index c0ac9a4..542d8f0 100644
--- a/public/map2.svg
+++ b/public/assets/images/map2.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg viewBox="-150 -150 600 800" xmlns="http://www.w3.org/2000/svg">
-  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="map.css" type="text/css"/>
+  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="../css/map.css" type="text/css"/>
   <style>
     #image-maps image {
       transform: none;
@@ -93,5 +93,5 @@
     </g>
     <g class="grid"/>
   </g>
-  <script href="map.js" data-cols="33" data-rows="77"></script>
+  <script href="../../map.js" data-cols="33" data-rows="77"></script>
 </svg>
diff --git a/public/map3.svg b/public/assets/images/map3.svg
similarity index 97%
rename from public/map3.svg
rename to public/assets/images/map3.svg
index 25a9518..9545a47 100644
--- a/public/map3.svg
+++ b/public/assets/images/map3.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg viewBox="-150 -150 600 800" xmlns="http://www.w3.org/2000/svg">
-  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="map.css" type="text/css"/>
+  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="../css/map.css" type="text/css"/>
   <style>
     #image-maps image {
       transform: translate(-10px, 0px);
@@ -90,5 +90,5 @@
     </g>
     <g class="grid"/>
   </g>
-  <script href="map.js" data-cols="33" data-rows="25"></script>
+  <script href="../../map.js" data-cols="33" data-rows="25"></script>
 </svg>
diff --git a/public/map4.svg b/public/assets/images/map4.svg
similarity index 94%
rename from public/map4.svg
rename to public/assets/images/map4.svg
index acb8336..e0ce981 100644
--- a/public/map4.svg
+++ b/public/assets/images/map4.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg viewBox="-150 -150 600 800" xmlns="http://www.w3.org/2000/svg">
-  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="map.css" type="text/css"/>
+  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="../css/map.css" type="text/css"/>
   <defs>
     <polygon id="hex" points="0,10 8.66,5 8.66,-5 0,-10 -8.66,-5 -8.66,5"/>
 
@@ -45,5 +45,5 @@
     <g class="grid"/>
   </g>
 
-  <script href="map.js" data-cols="33" data-rows="25"></script>
+  <script href="../../map.js" data-cols="33" data-rows="25"></script>
 </svg>
diff --git a/public/rendered_numbers.png b/public/assets/images/rendered_numbers.png
similarity index 100%
rename from public/rendered_numbers.png
rename to public/assets/images/rendered_numbers.png
diff --git a/public/row.jpg b/public/assets/images/row.jpg
similarity index 100%
rename from public/row.jpg
rename to public/assets/images/row.jpg
diff --git a/public/scans/countersheet1.jpg b/public/assets/images/scans/countersheet1.jpg
similarity index 100%
rename from public/scans/countersheet1.jpg
rename to public/assets/images/scans/countersheet1.jpg
diff --git a/public/scans/countersheet2.jpg b/public/assets/images/scans/countersheet2.jpg
similarity index 100%
rename from public/scans/countersheet2.jpg
rename to public/assets/images/scans/countersheet2.jpg
diff --git a/public/scans/countersheet3.jpg b/public/assets/images/scans/countersheet3.jpg
similarity index 100%
rename from public/scans/countersheet3.jpg
rename to public/assets/images/scans/countersheet3.jpg
diff --git a/public/scans/countersheet4.jpg b/public/assets/images/scans/countersheet4.jpg
similarity index 100%
rename from public/scans/countersheet4.jpg
rename to public/assets/images/scans/countersheet4.jpg
diff --git a/public/scans/map1.jpg b/public/assets/images/scans/map1.jpg
similarity index 100%
rename from public/scans/map1.jpg
rename to public/assets/images/scans/map1.jpg
diff --git a/public/scans/map2.jpg b/public/assets/images/scans/map2.jpg
similarity index 100%
rename from public/scans/map2.jpg
rename to public/assets/images/scans/map2.jpg
diff --git a/public/scans/map3.jpg b/public/assets/images/scans/map3.jpg
similarity index 100%
rename from public/scans/map3.jpg
rename to public/assets/images/scans/map3.jpg
diff --git a/public/scans/map4.jpg b/public/assets/images/scans/map4.jpg
similarity index 100%
rename from public/scans/map4.jpg
rename to public/assets/images/scans/map4.jpg
diff --git a/public/test.svg b/public/assets/images/test.svg
similarity index 100%
rename from public/test.svg
rename to public/assets/images/test.svg
diff --git a/public/firing_arc_large.png b/public/firing_arc_large.png
deleted file mode 100644
index c787537..0000000
Binary files a/public/firing_arc_large.png and /dev/null differ
diff --git a/public/firing_arc_medium.png b/public/firing_arc_medium.png
deleted file mode 100644
index 6cc69ce..0000000
Binary files a/public/firing_arc_medium.png and /dev/null differ
diff --git a/public/firing_arc_small.png b/public/firing_arc_small.png
deleted file mode 100644
index 80afcb0..0000000
Binary files a/public/firing_arc_small.png and /dev/null differ
diff --git a/public/index.html b/public/index.html
index cdab46c..03a4d53 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,11 +2,11 @@
 <html>
   <head>
     <title>Infantry Combat Solo Basic</title>
-    <link rel="stylesheet" href="style.css">
+    <link rel="stylesheet" href="assets/css/style.css">
   </head>
   <body>
     <template id="damage-block">
-      <link rel="stylesheet" href="damage_block.css">
+      <link rel="stylesheet" href="assets/css/damage_block.css">
 
       <slot name="block-number"></slot>
       <span class="damage-effect-indicator">
@@ -16,7 +16,7 @@
     </template>
 
     <template id="soldier-record-block">
-      <link rel="stylesheet" href="soldier_record_block.css">
+      <link rel="stylesheet" href="assets/css/soldier_record_block.css">
 
       <p class="physical-status-track">
         <span is="damage-block">
@@ -104,7 +104,7 @@
         Loading...
       </div>
 
-      <object type="image/svg+xml" data="map1.svg"></object>
+      <object type="image/svg+xml" data="assets/images/map1.svg"></object>
 
       <div id="status">
         <span id="hex-counter">Distance: <span id="hex-count">-</span></span>
@@ -124,16 +124,16 @@
         <span style="white-space: nowrap;">
           Prone: <input type="checkbox" id="toggle-prone-counter" />
           <button type="button" class="set-firing-arc" data-size="small">
-            <img src="firing_arc_small.png" height="12" /> 2 MP
+            <img src="assets/images/firing_arc_small.png" height="12" /> 2 MP
           </button>
           <button type="button" class="set-firing-arc" data-size="medium">
-            <img src="firing_arc_medium.png" height="12" /> 4 MP
+            <img src="assets/images/firing_arc_medium.png" height="12" /> 4 MP
           </button>
           <button type="button" class="set-firing-arc" data-size="large">
-            <img src="firing_arc_large.png" height="12" /> 6 MP
+            <img src="assets/images/firing_arc_large.png" height="12" /> 6 MP
           </button>
           <button type="button" class="set-grenade">
-            <img src="icon_grenade.png" height="12" />
+            <img src="assets/images/icon_grenade.png" height="12" />
           </button>
         </span>
       </div>
@@ -153,55 +153,6 @@
             <!-- 1st Squad, 3rd Platoon, Bravo Company, 2nd Battalion<br>
             17th Kestral Mechanized Infantry -->
           </p>
-          <!-- <div is="soldier-record-block" class="soldier-record" data-number="1" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>1</text></svg></span>
-            <span slot="primary-weapon-type">Rifle</span>
-            <span slot="primary-weapon-damage">4L</span>
-            <span slot="primary-weapon-range-short">1-27</span>
-            <span slot="primary-weapon-range-long">28-75</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="2" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>2</text></svg></span>
-            <span slot="primary-weapon-type">Rifle</span>
-            <span slot="primary-weapon-damage">4L</span>
-            <span slot="primary-weapon-range-short">1-27</span>
-            <span slot="primary-weapon-range-long">28-75</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="3" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>3</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="4" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>4</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="5" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>5</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="6" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>6</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="7" data-allegiance="davion">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>7</text></svg></span>
-            <span slot="primary-weapon-type">Blazer</span>
-            <span slot="primary-weapon-damage">4L</span>
-            <span slot="primary-weapon-range-short">1-17</span>
-            <span slot="primary-weapon-range-long">18-105</span>
-          </div> -->
         </div>
         <div id="defender-record">
           <!-- <img class="logo" src="logo-liao.png" /> -->
@@ -217,55 +168,6 @@
             <!-- 2nd Squad, 1st Platoon, 3rd Company, 2nd Battalion<br>
             Aldebaran Home Guard -->
           </p>
-          <!-- <div is="soldier-record-block" class="soldier-record" data-number="1" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>1</text></svg></span>
-            <span slot="primary-weapon-type">Rifle</span>
-            <span slot="primary-weapon-damage">4L</span>
-            <span slot="primary-weapon-range-short">1-27</span>
-            <span slot="primary-weapon-range-long">28-75</span>
-          </div> -->
-          <!-- <div is="soldier-record-block" class="soldier-record" data-number="2" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>2</text></svg></span>
-            <span slot="primary-weapon-type">Rifle</span>
-            <span slot="primary-weapon-damage">4L</span>
-            <span slot="primary-weapon-range-short">1-27</span>
-            <span slot="primary-weapon-range-long">28-75</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="3" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>3</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="4" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>4</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="5" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>5</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="6" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>6</text></svg></span>
-            <span slot="primary-weapon-type">SMG</span>
-            <span slot="primary-weapon-damage">3L</span>
-            <span slot="primary-weapon-range-short">1-15</span>
-            <span slot="primary-weapon-range-long">16-25</span>
-          </div>
-          <div is="soldier-record-block" class="soldier-record" data-number="7" data-allegiance="liao">
-            <span slot="troop-number"><svg viewBox="-5 -5 10 10" xmlns="http://www.w3.org/2000/svg"><circle cx="0" cy="0" r="5"/><text>7</text></svg></span>
-            <span slot="primary-weapon-type">Blazer</span>
-            <span slot="primary-weapon-damage">4L</span>
-            <span slot="primary-weapon-range-short">1-17</span>
-            <span slot="primary-weapon-range-long">18-105</span>
-          </div> -->
         </div>
       </div>
     </div>
diff --git a/scans/countersheet1.jpg b/scans/countersheet1.jpg
deleted file mode 100644
index 659070e..0000000
Binary files a/scans/countersheet1.jpg and /dev/null differ
diff --git a/scans/countersheet2.jpg b/scans/countersheet2.jpg
deleted file mode 100644
index 7a4d3ad..0000000
Binary files a/scans/countersheet2.jpg and /dev/null differ
diff --git a/scans/countersheet3.jpg b/scans/countersheet3.jpg
deleted file mode 100644
index dfe4696..0000000
Binary files a/scans/countersheet3.jpg and /dev/null differ
diff --git a/scans/countersheet4.jpg b/scans/countersheet4.jpg
deleted file mode 100644
index 028b216..0000000
Binary files a/scans/countersheet4.jpg and /dev/null differ
diff --git a/scans/map1.jpg b/scans/map1.jpg
deleted file mode 100644
index 8f6bc46..0000000
Binary files a/scans/map1.jpg and /dev/null differ
diff --git a/scans/map2.jpg b/scans/map2.jpg
deleted file mode 100644
index 82cd528..0000000
Binary files a/scans/map2.jpg and /dev/null differ
diff --git a/scans/map3.jpg b/scans/map3.jpg
deleted file mode 100644
index 08232e4..0000000
Binary files a/scans/map3.jpg and /dev/null differ
diff --git a/scans/map4.jpg b/scans/map4.jpg
deleted file mode 100644
index 8fa25dc..0000000
Binary files a/scans/map4.jpg and /dev/null differ
diff --git a/server.cjs b/server.cjs
index b5bd00f..19e6039 100644
--- a/server.cjs
+++ b/server.cjs
@@ -3,7 +3,7 @@ const { createServer } = require('esbuild-server');
 const server = createServer(
   {
     bundle: true,
-    entryPoints: ['src/index.js', 'src/map.js'],
+    entryPoints: ['src/index.js', 'src/map.js', 'src/soldier_record_block.js'],
     ...(process.env.NODE_ENV !== 'test') && {
       outdir: 'build'
     }
diff --git a/src/index.js b/src/index.js
index 4c7db30..800eea7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,7 +10,7 @@ const mapPlaceholder = document.querySelector('.map-placeholder'),
   proneToggle = document.getElementById('toggle-prone-counter'),
   contentVisToggleEl = document.querySelector('#content input[type="checkbox"].visible'),
   object = document.querySelector('object'),
-  fileName = `${localStorage.getItem('map') || 'map1'}.svg`,
+  fileName = `assets/images/${localStorage.getItem('map') || 'map1'}.svg`,
 
   toggleContentVis = (function () {
     document.querySelectorAll('#content div').forEach(div => {
@@ -132,5 +132,5 @@ object.addEventListener('load', load);
 objectDataObserver.observe(object, { attributeFilter: ['data'] });
 
 if (object.getAttribute('data') !== fileName) {
-  object.data = fileName;
+  object.data = `assets/images/${fileName}`;
 }
diff --git a/src/modules/map_select_dialog.js b/src/modules/map_select_dialog.js
index a9f8bc8..fc8eecc 100644
--- a/src/modules/map_select_dialog.js
+++ b/src/modules/map_select_dialog.js
@@ -34,7 +34,7 @@ export function init() {
         e.preventDefault();
         localStorage.removeItem('pan-zoom');
         localStorage.setItem('map', selectEl.value);
-        document.querySelector('object').data = `${selectEl.value}.svg`;
+        document.querySelector('object').data = `assets/images/${selectEl.value}.svg`;
         mapDialog.close();
       });
     }
diff --git a/public/soldier_record_block.js b/src/soldier_record_block.js
similarity index 100%
rename from public/soldier_record_block.js
rename to src/soldier_record_block.js