diff --git a/modules/ags/config/configurations/binto.ts b/modules/ags/config/configurations/binto.ts
index 3c6da082..f62900ba 100644
--- a/modules/ags/config/configurations/binto.ts
+++ b/modules/ags/config/configurations/binto.ts
@@ -3,16 +3,16 @@ import { App } from 'astal/gtk3';
 
 import style from '../style/main.scss';
 
-import AppLauncher from '../widgets/applauncher/main';
+import AppLauncher from '../widgets/applauncher';
 import AudioWindow from '../widgets/audio/binto';
 import Bar from '../widgets/bar/binto';
-import BgLayer from '../widgets/bg-layer/main';
+import BgLayer from '../widgets/bg-layer';
 import Calendar from '../widgets/date/binto';
-import Clipboard from '../widgets/clipboard/main';
+import Clipboard from '../widgets/clipboard';
 import { NotifPopups, NotifCenter } from '../widgets/notifs/binto';
-import OnScreenDisplay from '../widgets/on-screen-display/main';
-import PowerMenu from '../widgets/powermenu/main';
-import Screenshot from '../widgets/screenshot/main';
+import OnScreenDisplay from '../widgets/on-screen-display';
+import PowerMenu from '../widgets/powermenu';
+import Screenshot from '../widgets/screenshot';
 
 import { closeAll, perMonitor } from '../lib';
 import Brightness from '../services/brightness';
diff --git a/modules/ags/config/configurations/greeter.ts b/modules/ags/config/configurations/greeter.ts
index 0a3933bd..e6bc9976 100644
--- a/modules/ags/config/configurations/greeter.ts
+++ b/modules/ags/config/configurations/greeter.ts
@@ -1,7 +1,7 @@
 import { subprocess } from 'astal';
 import { App } from 'astal/gtk3';
 
-import Greeter from '../widgets/greeter/main';
+import Greeter from '../widgets/greeter';
 
 import style from '../style/greeter.scss';
 
diff --git a/modules/ags/config/configurations/lock.ts b/modules/ags/config/configurations/lock.ts
index 55d56145..d0f9d1a2 100644
--- a/modules/ags/config/configurations/lock.ts
+++ b/modules/ags/config/configurations/lock.ts
@@ -1,6 +1,6 @@
 import { App } from 'astal/gtk3';
 
-import Lockscreen from '../widgets/lockscreen/main';
+import Lockscreen from '../widgets/lockscreen';
 
 import style from '../style/lock.scss';
 
diff --git a/modules/ags/config/configurations/wim.ts b/modules/ags/config/configurations/wim.ts
index 1d561089..02502ecd 100644
--- a/modules/ags/config/configurations/wim.ts
+++ b/modules/ags/config/configurations/wim.ts
@@ -3,21 +3,21 @@ import { App } from 'astal/gtk3';
 
 import style from '../style/main.scss';
 
-import AppLauncher from '../widgets/applauncher/main';
+import AppLauncher from '../widgets/applauncher';
 import AudioWindow from '../widgets/audio/wim';
 import Bar from '../widgets/bar/wim';
-import BgLayer from '../widgets/bg-layer/main';
+import BgLayer from '../widgets/bg-layer';
 import BluetoothWindow from '../widgets/bluetooth/wim';
 import Calendar from '../widgets/date/wim';
-import Clipboard from '../widgets/clipboard/main';
-import Corners from '../widgets/corners/main';
-import IconBrowser from '../widgets/icon-browser/main';
+import Clipboard from '../widgets/clipboard';
+import Corners from '../widgets/corners';
+import IconBrowser from '../widgets/icon-browser';
 import NetworkWindow from '../widgets/network/wim';
 import { NotifPopups, NotifCenter } from '../widgets/notifs/wim';
-import OnScreenDisplay from '../widgets/on-screen-display/main';
-import OnScreenKeyboard from '../widgets/on-screen-keyboard/main';
-import PowerMenu from '../widgets/powermenu/main';
-import Screenshot from '../widgets/screenshot/main';
+import OnScreenDisplay from '../widgets/on-screen-display';
+import OnScreenKeyboard from '../widgets/on-screen-keyboard';
+import PowerMenu from '../widgets/powermenu';
+import Screenshot from '../widgets/screenshot';
 
 import { closeAll, perMonitor } from '../lib';
 import Brightness from '../services/brightness';
diff --git a/modules/ags/config/lib.ts b/modules/ags/config/lib/index.ts
similarity index 99%
rename from modules/ags/config/lib.ts
rename to modules/ags/config/lib/index.ts
index b769d392..34e16289 100644
--- a/modules/ags/config/lib.ts
+++ b/modules/ags/config/lib/index.ts
@@ -4,7 +4,7 @@ import { App, Gdk, Gtk } from 'astal/gtk3';
 import AstalHyprland from 'gi://AstalHyprland';
 
 /* Types */
-import PopupWindow from './widgets/misc/popup-window';
+import PopupWindow from '../widgets/misc/popup-window';
 
 export interface Layer {
     address: string
diff --git a/modules/ags/config/widgets/applauncher/main.tsx b/modules/ags/config/widgets/applauncher/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/applauncher/main.tsx
rename to modules/ags/config/widgets/applauncher/index.tsx
diff --git a/modules/ags/config/widgets/bg-layer/main.tsx b/modules/ags/config/widgets/bg-layer/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/bg-layer/main.tsx
rename to modules/ags/config/widgets/bg-layer/index.tsx
diff --git a/modules/ags/config/widgets/clipboard/main.tsx b/modules/ags/config/widgets/clipboard/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/clipboard/main.tsx
rename to modules/ags/config/widgets/clipboard/index.tsx
diff --git a/modules/ags/config/widgets/corners/main.tsx b/modules/ags/config/widgets/corners/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/corners/main.tsx
rename to modules/ags/config/widgets/corners/index.tsx
diff --git a/modules/ags/config/widgets/greeter/main.tsx b/modules/ags/config/widgets/greeter/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/greeter/main.tsx
rename to modules/ags/config/widgets/greeter/index.tsx
diff --git a/modules/ags/config/widgets/icon-browser/main.tsx b/modules/ags/config/widgets/icon-browser/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/icon-browser/main.tsx
rename to modules/ags/config/widgets/icon-browser/index.tsx
diff --git a/modules/ags/config/widgets/lockscreen/main.tsx b/modules/ags/config/widgets/lockscreen/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/lockscreen/main.tsx
rename to modules/ags/config/widgets/lockscreen/index.tsx
diff --git a/modules/ags/config/widgets/on-screen-display/main.tsx b/modules/ags/config/widgets/on-screen-display/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/on-screen-display/main.tsx
rename to modules/ags/config/widgets/on-screen-display/index.tsx
diff --git a/modules/ags/config/widgets/on-screen-keyboard/main.tsx b/modules/ags/config/widgets/on-screen-keyboard/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/on-screen-keyboard/main.tsx
rename to modules/ags/config/widgets/on-screen-keyboard/index.tsx
diff --git a/modules/ags/config/widgets/powermenu/main.tsx b/modules/ags/config/widgets/powermenu/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/powermenu/main.tsx
rename to modules/ags/config/widgets/powermenu/index.tsx
diff --git a/modules/ags/config/widgets/screenshot/main.tsx b/modules/ags/config/widgets/screenshot/index.tsx
similarity index 100%
rename from modules/ags/config/widgets/screenshot/main.tsx
rename to modules/ags/config/widgets/screenshot/index.tsx