file structure

client/svelte-client/src/App.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
-    import Canvas from "./Canvas.svelte";
-    import Fps from "./Fps.svelte";
-    import Input from "./Input.svelte";
-    import {sessionStore} from "./game/session";
-    import ModeSelect from "./ModeSelect.svelte";
-    import {network} from "./game/network";
-    import GameSettings from "./GameSettings.svelte";
-    import SessionWrapper from "./SessionWrapper.svelte";
-    import api from "./game/api";
+    import Canvas from "./components/Canvas.svelte";
+    import Fps from "./components/Fps.svelte";
+    import Input from "./components/Input.svelte";
+    import {sessionStore} from "./store/session";
+    import ModeSelect from "./components/ModeSelect.svelte";
+    import {network} from "./store/network";
+    import GameSettings from "./components/GameSettings.svelte";
+    import SessionWrapper from "./components/SessionWrapper.svelte";
+    import api from "./api/session";
 
     let debug = false;
 

client/svelte-client/src/api/session.ts

@@ -1,5 +1,5 @@
-import type {LocalSession, Player, Session} from "./session";
-import {SessionState, SessionType} from "./session";
+import type {LocalSession, Player, Session} from "../store/session";
+import {SessionState, SessionType} from "../store/session";
 
 async function createLocalSession(): Promise<LocalSession> {
     await new Promise((res) => {

client/svelte-client/src/components/Canvas.svelte

@@ -2,7 +2,7 @@
     import {FieldWrapper} from "wasm-app";
     import {getContext, onMount, setContext} from "svelte";
     import {get, writable} from "svelte/store";
-    import {drawObjects} from "./game/render";
+    import {drawObjects} from "../store/render";
     import {
         engineCanvas,
         engineCtx,
@@ -11,8 +11,8 @@
         props,
         renderContext,
         width
-    } from "./game/engine";
-    import {Input} from "./game/session";
+    } from "../store/engine";
+    import {Input} from "../store/session";
 
     export let inputs: Input[] = []
 

client/svelte-client/src/components/Fps.svelte

@@ -1,6 +1,6 @@
 <script>
     import Text from "./Text.svelte";
-    import {renderable} from "./game/engine";
+    import {renderable} from "../store/engine";
 
     let text = '';
 

client/svelte-client/src/components/Input.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import type {Input} from "./game/session";
+    import type {Input} from "../store/session";
 
     const availableInputs: string[] = ["UP", "DOWN"]
     export let inputs: Input[] = [];

client/svelte-client/src/components/LocalSessionWrapper.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import {localSessionInputs, Session} from "./game/session";
+    import {localSessionInputs, Session} from "../store/session";
 
     export let session: Session;
 </script>

client/svelte-client/src/components/NetworkSessionWrapper.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
 
-    import type {NetworkSession} from "./game/session";
+    import type {NetworkSession} from "../store/session";
     import {
         hostNetworkSessionInputs,
         observerNetworkSessionInputs,
         peerNetworkSessionInputs
-    } from "./game/session";
+    } from "../store/session";
 
     export let session: NetworkSession;
 </script>

client/svelte-client/src/components/SessionWrapper.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-    import {localSessionInputs, Session, SessionState, SessionType} from "./game/session";
+    import {localSessionInputs, Session, SessionState, SessionType} from "../store/session";
     import LocalSessionWrapper from "./LocalSessionWrapper.svelte";
     import NetworkSessionWrapper from "./NetworkSessionWrapper.svelte";
 

client/svelte-client/src/components/Text.svelte

@@ -1,5 +1,5 @@
 <script>
-    import {renderable} from "./game/engine";
+    import {renderable} from "../store/engine";
 
     export let color = 'hsl(0, 0%, 100%)';
     export let align = 'center';

client/svelte-client/src/store/engine.ts

@@ -7,7 +7,7 @@ export const width = writable(800);
 export const height = writable(600);
 export const pixelRatio = writable(window.devicePixelRatio);
 
-// A more convenient store for grabbing all game props
+// A more convenient store for grabbing all store props
 export const props = deriveObject({
     width,
     height,

server/src/session.rs

@@ -37,7 +37,7 @@ impl Session {
 #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 pub enum SessionState {
     PENDING, // 1 player is missing
-    RUNNING, // game is playing
-    CLOSED,  // game is over
+    RUNNING, // store is playing
+    CLOSED,  // store is over
 }