diff --git a/src/lib/components/ShipEdit.svelte b/src/lib/components/ShipEdit.svelte
index 98abf9d..242843f 100644
--- a/src/lib/components/ShipEdit.svelte
+++ b/src/lib/components/ShipEdit.svelte
@@ -2,6 +2,7 @@
   <Identification {...identification} />
   <Propulsion {...propulsion} />
   <Structure {...structure} />
+  <Weaponry {...weaponry} />
 </main>
 
 <script>
@@ -9,10 +10,12 @@
   import Propulsion from "./ShipEdit/Propulsion.svelte";
   import shipDux from "$lib/store/ship";
   import Structure from "./ShipEdit/Structure.svelte";
+  import Weaponry from "./ShipEdit/Weaponry.svelte";
 
   export let identification = {};
   export let propulsion = {};
   export let structure = {};
+  export let weaponry = {};
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
index 93c8f3a..a9e162b 100644
--- a/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Drive/index.svelte
@@ -17,8 +17,8 @@
 
 <script>
   import { getContext } from "svelte";
-  import Field from "$lib/components/Field/index.svelte";
-  import ShipItem from "$lib/components/ShipItem/index.svelte";
+  import Field from "$lib/components/Field.svelte";
+  import ShipItem from "$lib/components/ShipItem.svelte";
 
   export let reqs = {};
   export let advanced = false;
diff --git a/src/lib/components/ShipEdit/Structure/index.svelte b/src/lib/components/ShipEdit/Structure/index.svelte
index f6c583e..58e8139 100644
--- a/src/lib/components/ShipEdit/Structure/index.svelte
+++ b/src/lib/components/ShipEdit/Structure/index.svelte
@@ -7,7 +7,7 @@
 </Section>
 
 <script>
-  import Section from "$lib/components/Section/index.svelte";
+  import Section from "$lib/components/Section.svelte";
   import Hull from './Hull.svelte';
   import Screens from './Screens.svelte';
   import Cargo from './Cargo.svelte';
diff --git a/src/lib/components/ShipEdit/Weaponry.svelte b/src/lib/components/ShipEdit/Weaponry.svelte
new file mode 100644
index 0000000..5d133ab
--- /dev/null
+++ b/src/lib/components/ShipEdit/Weaponry.svelte
@@ -0,0 +1,39 @@
+<Section label="weaponry">
+  <Firecons {...firecons} />
+
+  <ADFC {...adfc} />
+  <!--
+
+    <AddWeapon />
+
+    {#each weapons as weapon (weapon.id)}
+        <Weapon {weapon} id={weapon.id} />
+    {/each}
+    -->
+</Section>
+
+<script>
+  import { getContext } from "svelte";
+
+  import Section from "$lib/components/Section.svelte";
+
+  import ShipItem from "$lib/components/ShipItem.svelte";
+  import Field from "$lib/components/Field.svelte";
+
+  import Firecons from "./Weaponry/Firecons.svelte";
+  import ADFC from "./Weaponry/ADFC.svelte";
+
+  export let firecons = {};
+  export let adfc = {};
+  /*
+
+    import AddWeapon from './AddWeapon.svelte';
+    import Weapon from './Weapon/index.svelte';
+
+
+export let weapons = [];
+*/
+</script>
+
+<style>
+</style>
diff --git a/src/lib/components/ShipEdit/Weaponry/ADFC.svelte b/src/lib/components/ShipEdit/Weaponry/ADFC.svelte
index 93da8e6..9b6f795 100644
--- a/src/lib/components/ShipEdit/Weaponry/ADFC.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/ADFC.svelte
@@ -5,14 +5,14 @@
 </ShipItem>
 
 <script>
-    import { getContext } from 'svelte';
-  import ShipItem from "$lib/components/ShipItem/index.svelte";
-  import Field from "$lib/components/Field/index.svelte";
+  import { getContext } from "svelte";
+  import ShipItem from "$lib/components/ShipItem.svelte";
+  import Field from "$lib/components/Field.svelte";
 
   export let rating = 0;
   export let reqs = {};
 
-  const { dispatch } = getContext('ship');
+  const api = getContext("api");
 
-  $: dispatch.setADFC(rating);
+  $: api?.dispatch?.setADFC?.(rating);
 </script>
diff --git a/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte b/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
index fac5724..19a85b0 100644
--- a/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/AddWeapon.svelte
@@ -10,7 +10,7 @@
 
 <script>
   import { getContext } from "svelte";
-  import Field from "../../Field/index.svelte";
+  import Field from "../../Field.svelte";
 
   import { weaponTypes } from "$lib/shipDux/weaponry/weapons";
 
diff --git a/src/lib/components/ShipEdit/Weaponry/Firecons.svelte b/src/lib/components/ShipEdit/Weaponry/Firecons.svelte
index 24ffc9c..31810a8 100644
--- a/src/lib/components/ShipEdit/Weaponry/Firecons.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/Firecons.svelte
@@ -5,16 +5,16 @@
 </ShipItem>
 
 <script>
-import { getContext } from 'svelte';
-  import ShipItem from "$lib/components/ShipItem/index.svelte";
-  import Field from "$lib/components/Field/index.svelte";
+  import { getContext } from "svelte";
+  import ShipItem from "$lib/components/ShipItem.svelte";
+  import Field from "$lib/components/Field.svelte";
 
   export let stations = 0;
   export let reqs = {};
 
-  const { dispatch } = getContext('ship');
+  export let api = getContext("api");
 
-  $: dispatch.setFirecons(stations);
+  $: api?.dispatch?.setFirecons?.(stations);
 </script>
 
 <style>
diff --git a/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte b/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
index 0ba11a7..28569e5 100644
--- a/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/Weapon/Beam/index.svelte
@@ -23,8 +23,8 @@
     import { getContext } from "svelte";
 
     import Arcs from "../Arcs.svelte";
-    import ShipItem from "$lib/components/ShipItem/index.svelte";
-    import Field from "$lib/components/Field/index.svelte";
+    import ShipItem from "$lib/components/ShipItem.svelte";
+    import Field from "$lib/components/Field.svelte";
 
     import { createEventDispatcher } from "svelte";
 
diff --git a/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte b/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte
index dc8965a..0f799df 100644
--- a/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte
+++ b/src/lib/components/ShipEdit/Weaponry/Weapon/index.svelte
@@ -17,8 +17,8 @@
   import { getContext } from "svelte";
 
   import Arc from "./Arc.svelte";
-  import ShipItem from "$lib/components/ShipItem/index.svelte";
-  import Field from "$lib/components/Field/index.svelte";
+  import ShipItem from "$lib/components/ShipItem.svelte";
+  import Field from "$lib/components/Field.svelte";
    import Beam from "./Beam/index.svelte";
    import Submunition from "./Submunition.svelte";
    import PointDefenceSystem from "./PDS.svelte";
diff --git a/src/lib/components/ShipEdit/Weaponry/index.svelte b/src/lib/components/ShipEdit/Weaponry/index.svelte
deleted file mode 100644
index d9b168b..0000000
--- a/src/lib/components/ShipEdit/Weaponry/index.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<Section label="weaponry">
-    <Firecons {...firecons} />
-
-    <ADFC {...adfc} />
-
-    <AddWeapon />
-
-    {#each weapons as weapon (weapon.id)}
-        <Weapon {weapon} id={weapon.id} />
-    {/each}
-
-</Section>
-
-<script>
-import { getContext } from 'svelte';
-
-  import Section from "$lib/components/Section/index.svelte";
-import ShipItem from '$lib/components/ShipItem/index.svelte';
-import Field from '$lib/components/Field/index.svelte';
-
-  import Firecons from './Firecons.svelte';
-  import ADFC from './ADFC.svelte';
-    import AddWeapon from './AddWeapon.svelte';
-    import Weapon from './Weapon/index.svelte';
-
-  export let firecons = {};
-  export let adfc = {};
-
-export let weapons = [];
-
-</script>
-
-<style>
-</style>