diff --git a/src/App.svelte b/src/App.svelte
index 3ac80059..250c903d 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -41,7 +41,7 @@
   import Settings from "./components/settings/Settings.svelte";
   import Transition from "./components/base/Transition.svelte";
   import Orgs from "./components/orgs/Orgs.svelte";
-  import CardAssignment from "./components/general/CardAssignment.svelte";
+  import CardAssignment from "./components/tools/CardAssignment.svelte";
   import Runners from "./components/runners/Runners.svelte";
   import Footer from "./components/general/Footer.svelte";
   import TracksOverview from "./components/tracks/TracksOverview.svelte";
@@ -70,7 +70,7 @@
   import Cards from "./components/cards/Cards.svelte";
   import StatsClients from "./components/statsclients/StatsClients.svelte";
   import StatsClientDetail from "./components/statsclients/StatsClientDetail.svelte";
-  import CardReplacement from "./components/general/CardReplacement.svelte";
+  import CardReplacement from "./components/tools/CardReplacement.svelte";
   store.init();
 </script>
 
diff --git a/src/components/general/CardAssignment.svelte b/src/components/tools/CardAssignment.svelte
similarity index 100%
rename from src/components/general/CardAssignment.svelte
rename to src/components/tools/CardAssignment.svelte
diff --git a/src/components/general/CardReplacement.svelte b/src/components/tools/CardReplacement.svelte
similarity index 100%
rename from src/components/general/CardReplacement.svelte
rename to src/components/tools/CardReplacement.svelte
diff --git a/src/components/general/QrCodeScanner.svelte b/src/components/tools/QrCodeScanner.svelte
similarity index 100%
rename from src/components/general/QrCodeScanner.svelte
rename to src/components/tools/QrCodeScanner.svelte