diff --git a/client/svelte-client/src/App.svelte b/client/svelte-client/src/App.svelte
index b38be63..35cdf79 100644
--- a/client/svelte-client/src/App.svelte
+++ b/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;
 
diff --git a/client/svelte-client/src/game/api.ts b/client/svelte-client/src/api/session.ts
similarity index 91%
rename from client/svelte-client/src/game/api.ts
rename to client/svelte-client/src/api/session.ts
index c660451..a949009 100644
--- a/client/svelte-client/src/game/api.ts
+++ b/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) => {
diff --git a/client/svelte-client/src/Canvas.svelte b/client/svelte-client/src/components/Canvas.svelte
similarity index 96%
rename from client/svelte-client/src/Canvas.svelte
rename to client/svelte-client/src/components/Canvas.svelte
index 8b8d85b..b42c187 100644
--- a/client/svelte-client/src/Canvas.svelte
+++ b/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[] = []
 
diff --git a/client/svelte-client/src/Fps.svelte b/client/svelte-client/src/components/Fps.svelte
similarity index 93%
rename from client/svelte-client/src/Fps.svelte
rename to client/svelte-client/src/components/Fps.svelte
index d23ac1f..8891907 100644
--- a/client/svelte-client/src/Fps.svelte
+++ b/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 = '';
 
diff --git a/client/svelte-client/src/GameSettings.svelte b/client/svelte-client/src/components/GameSettings.svelte
similarity index 100%
rename from client/svelte-client/src/GameSettings.svelte
rename to client/svelte-client/src/components/GameSettings.svelte
diff --git a/client/svelte-client/src/Input.svelte b/client/svelte-client/src/components/Input.svelte
similarity index 96%
rename from client/svelte-client/src/Input.svelte
rename to client/svelte-client/src/components/Input.svelte
index 1d91dd1..8705fe4 100644
--- a/client/svelte-client/src/Input.svelte
+++ b/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[] = [];
diff --git a/client/svelte-client/src/LocalSessionWrapper.svelte b/client/svelte-client/src/components/LocalSessionWrapper.svelte
similarity index 61%
rename from client/svelte-client/src/LocalSessionWrapper.svelte
rename to client/svelte-client/src/components/LocalSessionWrapper.svelte
index 00a310a..8d0fea0 100644
--- a/client/svelte-client/src/LocalSessionWrapper.svelte
+++ b/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>
diff --git a/client/svelte-client/src/ModeSelect.svelte b/client/svelte-client/src/components/ModeSelect.svelte
similarity index 100%
rename from client/svelte-client/src/ModeSelect.svelte
rename to client/svelte-client/src/components/ModeSelect.svelte
diff --git a/client/svelte-client/src/NetworkSessionWrapper.svelte b/client/svelte-client/src/components/NetworkSessionWrapper.svelte
similarity index 86%
rename from client/svelte-client/src/NetworkSessionWrapper.svelte
rename to client/svelte-client/src/components/NetworkSessionWrapper.svelte
index 6dfd444..061589a 100644
--- a/client/svelte-client/src/NetworkSessionWrapper.svelte
+++ b/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>
diff --git a/client/svelte-client/src/SessionWrapper.svelte b/client/svelte-client/src/components/SessionWrapper.svelte
similarity index 96%
rename from client/svelte-client/src/SessionWrapper.svelte
rename to client/svelte-client/src/components/SessionWrapper.svelte
index 6d1b044..3ff9f85 100644
--- a/client/svelte-client/src/SessionWrapper.svelte
+++ b/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";
 
diff --git a/client/svelte-client/src/Text.svelte b/client/svelte-client/src/components/Text.svelte
similarity index 93%
rename from client/svelte-client/src/Text.svelte
rename to client/svelte-client/src/components/Text.svelte
index 7eedb07..fa79ef2 100644
--- a/client/svelte-client/src/Text.svelte
+++ b/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';
diff --git a/client/svelte-client/src/game/engine.ts b/client/svelte-client/src/store/engine.ts
similarity index 96%
rename from client/svelte-client/src/game/engine.ts
rename to client/svelte-client/src/store/engine.ts
index d039f5f..1804413 100644
--- a/client/svelte-client/src/game/engine.ts
+++ b/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,
diff --git a/client/svelte-client/src/game/io.ts b/client/svelte-client/src/store/io.ts
similarity index 100%
rename from client/svelte-client/src/game/io.ts
rename to client/svelte-client/src/store/io.ts
diff --git a/client/svelte-client/src/game/network.ts b/client/svelte-client/src/store/network.ts
similarity index 100%
rename from client/svelte-client/src/game/network.ts
rename to client/svelte-client/src/store/network.ts
diff --git a/client/svelte-client/src/game/render.ts b/client/svelte-client/src/store/render.ts
similarity index 100%
rename from client/svelte-client/src/game/render.ts
rename to client/svelte-client/src/store/render.ts
diff --git a/client/svelte-client/src/game/session.ts b/client/svelte-client/src/store/session.ts
similarity index 100%
rename from client/svelte-client/src/game/session.ts
rename to client/svelte-client/src/store/session.ts
diff --git a/server/src/session.rs b/server/src/session.rs
index ac0d252..b4ff381 100644
--- a/server/src/session.rs
+++ b/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
 }