diff --git a/src/App.svelte b/src/App.svelte
index 5aeb321..39b6445 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -10,9 +10,9 @@
   import { Route, router, active } from "tinro";
   router.mode.hash(); // enables hash navigation method
   //router.mode.memory(); // enables in-memory navigation method
-  import Card from "./Card.svelte";
+  import Card from "./widgets/Card.svelte";
   import Input from "./Input.svelte";
-  import Myinput from "./Myinput.svelte";
+  import Myinput from "./widgets/Input.svelte";
 
   onMount(async () => {
     console.log("mounted");
diff --git a/src/Input.svelte b/src/Input.svelte
deleted file mode 100644
index 07404be..0000000
--- a/src/Input.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script context="module">
-  import { WSpush } from "./App.svelte";
-</script>
-
-<script>
-  export let title;
-  export let value;
-</script>
-
-<div class="container">
-  <div class="card-items">
-    <div class="md:w-1/3">
-      <!-- svelte-ignore a11y-label-has-associated-control -->
-      <label class="descr-gray">{title}</label>
-    </div>
-    <div class="md:w-2/3">
-      <input bind:value on:change={WSpush(value)} class="widget-input-indigo" type="text" />
-    </div>
-  </div>
-</div>
diff --git a/src/Card.svelte b/src/widgets/Card.svelte
similarity index 100%
rename from src/Card.svelte
rename to src/widgets/Card.svelte
diff --git a/src/Myinput.svelte b/src/widgets/Input.svelte
similarity index 96%
rename from src/Myinput.svelte
rename to src/widgets/Input.svelte
index 55ac2f6..f916eca 100644
--- a/src/Myinput.svelte
+++ b/src/widgets/Input.svelte
@@ -1,5 +1,5 @@
 <script context="module">
-  import { WSpush } from "./App.svelte";
+  import { WSpush } from "../App.svelte";
 </script>
 
 <script>