20 files changed, 20 insertions, 19 deletions
diff --git a/config/Launcher.qml b/config/Launcher.qml
index f2141e9..96da659 100644
--- a/config/Launcher.qml
+++ b/config/Launcher.qml
@@ -2,7 +2,7 @@ pragma Singleton
 
 import Quickshell
 import QtQuick
-import qs.launcher.components
+import qs.popups.launcher.components
 
 Singleton {
     id: root
diff --git a/launcher/ILauncher.qml b/popups/IPopup.qml
index afb9250..59d569d 100644
--- a/launcher/ILauncher.qml
+++ b/popups/IPopup.qml
@@ -1,14 +1,8 @@
-import Quickshell
-import Quickshell.Hyprland
 import Quickshell.Wayland
-import QtQuick.Controls
-import QtQuick
 
 import qs.components
-import qs.config
 
 IWindow {
-    id: root
     required property var parentLoader
     // TODO: optional only display on focused screen
     focusable: true
@@ -21,12 +15,4 @@ IWindow {
         left: false
         right: false
     }
-
-    HyprlandFocusGrab {
-        active: true
-        windows: [root]
-        onCleared: {
-            parentLoader.active = false; // or active = true again
-        }
-    }
 }
diff --git a/popups/launcher/ILauncher.qml b/popups/launcher/ILauncher.qml
new file mode 100644
index 0000000..325ab2c
--- /dev/null
+++ b/popups/launcher/ILauncher.qml
@@ -0,0 +1,15 @@
+import Quickshell.Hyprland
+
+import ".."
+
+IPopup {
+    id: root
+
+    HyprlandFocusGrab {
+        active: true
+        windows: [root]
+        onCleared: {
+            parentLoader.active = false; // or active = true again
+        }
+    }
+}
diff --git a/launcher/Launcher.qml b/popups/launcher/Launcher.qml
index 25b2926..25b2926 100644
--- a/launcher/Launcher.qml
+++ b/popups/launcher/Launcher.qml
diff --git a/launcher/components/App.qml b/popups/launcher/components/App.qml
index 0bb5fd9..0bb5fd9 100644
--- a/launcher/components/App.qml
+++ b/popups/launcher/components/App.qml
diff --git a/launcher/components/Calc.qml b/popups/launcher/components/Calc.qml
index c6cdbc1..c6cdbc1 100644
--- a/launcher/components/Calc.qml
+++ b/popups/launcher/components/Calc.qml
diff --git a/launcher/components/Clip.qml b/popups/launcher/components/Clip.qml
index bc8d65f..bc8d65f 100644
--- a/launcher/components/Clip.qml
+++ b/popups/launcher/components/Clip.qml
diff --git a/launcher/components/Emoji.qml b/popups/launcher/components/Emoji.qml
index d1343e6..d1343e6 100644
--- a/launcher/components/Emoji.qml
+++ b/popups/launcher/components/Emoji.qml
diff --git a/launcher/components/Finder.qml b/popups/launcher/components/Finder.qml
index e69de29..e69de29 100644
--- a/launcher/components/Finder.qml
+++ b/popups/launcher/components/Finder.qml
diff --git a/launcher/components/Flight.qml b/popups/launcher/components/Flight.qml
index e69de29..e69de29 100644
--- a/launcher/components/Flight.qml
+++ b/popups/launcher/components/Flight.qml
diff --git a/launcher/components/IComponent.qml b/popups/launcher/components/IComponent.qml
index 4f47b88..4f47b88 100644
--- a/launcher/components/IComponent.qml
+++ b/popups/launcher/components/IComponent.qml
diff --git a/launcher/components/IInnerComponent.qml b/popups/launcher/components/IInnerComponent.qml
index 7bbc9f0..7bbc9f0 100644
--- a/launcher/components/IInnerComponent.qml
+++ b/popups/launcher/components/IInnerComponent.qml
diff --git a/launcher/components/SelectionState.qml b/popups/launcher/components/SelectionState.qml
index 1ab577a..1ab577a 100644
--- a/launcher/components/SelectionState.qml
+++ b/popups/launcher/components/SelectionState.qml
diff --git a/launcher/components/Spell.qml b/popups/launcher/components/Spell.qml
index fe01c3f..fe01c3f 100644
--- a/launcher/components/Spell.qml
+++ b/popups/launcher/components/Spell.qml
diff --git a/launcher/components/Time.qml b/popups/launcher/components/Time.qml
index e69de29..e69de29 100644
--- a/launcher/components/Time.qml
+++ b/popups/launcher/components/Time.qml
diff --git a/launcher/components/Translate.qml b/popups/launcher/components/Translate.qml
index e69de29..e69de29 100644
--- a/launcher/components/Translate.qml
+++ b/popups/launcher/components/Translate.qml
diff --git a/launcher/components/Weather.qml b/popups/launcher/components/Weather.qml
index e69de29..e69de29 100644
--- a/launcher/components/Weather.qml
+++ b/popups/launcher/components/Weather.qml
diff --git a/launcher/components/Web.qml b/popups/launcher/components/Web.qml
index e69de29..e69de29 100644
--- a/launcher/components/Web.qml
+++ b/popups/launcher/components/Web.qml
diff --git a/launcher/todo.md b/popups/launcher/todo.md
index 3ed0252..3ed0252 100644
--- a/launcher/todo.md
+++ b/popups/launcher/todo.md
diff --git a/shell.qml b/shell.qml
index 7ef4362..6a64025 100644
--- a/shell.qml
+++ b/shell.qml
@@ -1,7 +1,7 @@
 import Quickshell
 import Quickshell.Io
 import "bar"
-import "launcher"
+import "popups/launcher"
 
 import QtQuick
 
@@ -50,8 +50,8 @@ Scope {
             root.standaloneObj.obj = Qt.createQmlObject(`
 				import Quickshell
 				import QtQuick
-				import "launcher"
-				import "launcher/components"
+				import "popups/launcher"
+				import "popups/launcher/components"
 
 				LazyLoader {
 					property QtObject selectionState: QtObject {
@@ -66,7 +66,7 @@ Scope {
 					readonly property list<Component> widgets: [
 						Component {
 							Loader {
-								sourceComponent: Qt.createComponent("launcher/components/" + "${component}.qml")
+								sourceComponent: Qt.createComponent("popups/launcher/components/" + "${component}.qml")
 								onLoaded: {
 									item.standalone = true
 									item.state = selectionState;