13 files changed, 27 insertions, 29 deletions
diff --git a/src/App.svelte b/src/App.svelte
deleted file mode 100644
index 09b69c3..0000000
--- a/src/App.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<script lang="ts">
-
-import LeftPanel from './components/LeftPanel.svelte';
-import RightPanel from './components/RightPanel.svelte';
-import MainPanel from './components/MainPanel.svelte';
-import Loading from './components/Loading.svelte';
-
-</script>
-
-<LeftPanel />
-<MainPanel />
-<RightPanel />
-<Loading />
-
diff --git a/src/app.svelte b/src/app.svelte
new file mode 100644
index 0000000..399214b
--- /dev/null
+++ b/src/app.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+
+import LeftPanel from './components/left_panel.svelte';
+import RightPanel from './components/right_panel.svelte';
+import MainPanel from './components/main_panel.svelte';
+import Loading from './components/loading.svelte';
+
+</script>
+
+<LeftPanel />
+<MainPanel />
+<RightPanel />
+<Loading />
+
diff --git a/src/data/cardDb.js b/src/card_db.js
index b9b991f..b9b991f 100644
--- a/src/data/cardDb.js
+++ b/src/card_db.js
diff --git a/src/components/CardThumb.svelte b/src/components/card_thumb.svelte
index 2f722a9..8e701ea 100644
--- a/src/components/CardThumb.svelte
+++ b/src/components/card_thumb.svelte
@@ -1,6 +1,6 @@
 <script lang="js">
 
-    import {setLeftPanelCard} from '../control/left_panel';
+    import { setLeftPanelCard } from '../left_panel';
     import { cardImageUrl } from '../utils';
 
     let {id, area, idx} = $props();
@@ -30,6 +30,4 @@
 
 <style>
 
-
-
 </style>
diff --git a/src/components/LeftPanel.svelte b/src/components/left_panel.svelte
index 90937f2..d69199e 100644
--- a/src/components/LeftPanel.svelte
+++ b/src/components/left_panel.svelte
@@ -3,7 +3,7 @@
     import {
         leftPanelCardId,
         leftPanelCardDesc,
-    } from '../control/left_panel';
+    } from '../left_panel';
 
     import { cardImageUrl } from '../utils';
 
diff --git a/src/components/Loading.svelte b/src/components/loading.svelte
index 5fb6f9a..fb49495 100644
--- a/src/components/Loading.svelte
+++ b/src/components/loading.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { isLoading } from '../control/loading';
+    import { isLoading } from '../loading';
 </script>
 
 {#if $isLoading}
diff --git a/src/components/MainPanel.svelte b/src/components/main_panel.svelte
index f023dd9..2db7a34 100644
--- a/src/components/MainPanel.svelte
+++ b/src/components/main_panel.svelte
@@ -1,6 +1,6 @@
 <script lang="js">
-    import CardThumb from './CardThumb.svelte';
-    import { deck, setDeck, deckOps } from '../control/deck';
+    import CardThumb from './card_thumb.svelte';
+    import { deck, setDeck, deckOps } from '../deck';
     import {
         parseYdk,
         genYdk,
diff --git a/src/components/RightPanel.svelte b/src/components/right_panel.svelte
index c9904fa..816687e 100644
--- a/src/components/RightPanel.svelte
+++ b/src/components/right_panel.svelte
@@ -1,7 +1,7 @@
 <script lang="js">
-    import CardThumb from './CardThumb.svelte';
-    import { changeInput, showingCards, onPrevPage, onNextPage } from '../control/search'
-    import { deckOps } from '../control/deck';
+    import CardThumb from './card_thumb.svelte';
+    import { changeInput, showingCards, onPrevPage, onNextPage } from '../search'
+    import { deckOps } from '../deck';
 
     function onChange(event) {
         changeInput(event.target.value);
diff --git a/src/control/deck.js b/src/deck.js
index 43c784f..285320b 100644
--- a/src/control/deck.js
+++ b/src/deck.js
@@ -1,6 +1,6 @@
 import { writable } from "svelte/store";
-import { parseYdke } from '../utils';
-import { getCardDb, getAltId } from '../data/cardDb';
+import { parseYdke } from './utils';
+import { getCardDb, getAltId } from './card_db';
 
 let deck = writable({main: [], extra: [], side: []});
 let deckState = {main: [], extra: [], side: []};
diff --git a/src/control/left_panel.js b/src/left_panel.js
index 87d8a4a..87d8a4a 100644
--- a/src/control/left_panel.js
+++ b/src/left_panel.js
diff --git a/src/control/loading.js b/src/loading.js
index 2d0b1ce..2fed39f 100644
--- a/src/control/loading.js
+++ b/src/loading.js
@@ -1,7 +1,7 @@
 import { writable } from 'svelte/store';
 import { initSearch } from './search';
 import { initDeck } from './deck';
-import { setCardDb, setAltId } from '../data/cardDb';
+import { setCardDb, setAltId } from './card_db';
 
 let isLoading = writable(true);
 
diff --git a/src/main.ts b/src/main.ts
index 928b6c5..7b9d006 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,5 @@
 import { mount } from 'svelte'
-import App from './App.svelte'
+import App from './app.svelte'
 
 const app = mount(App, {
   target: document.getElementById('app')!,
diff --git a/src/control/search.js b/src/search.js
index 5927950..f1f7dbd 100644
--- a/src/control/search.js
+++ b/src/search.js
@@ -1,5 +1,5 @@
 import { writable } from 'svelte/store';
-import { getCardDb} from '../data/cardDb';
+import { getCardDb } from './card_db';
 
 let showingCards = writable([]);
 let resultCards = [];