diff --git a/.config/sway/kd-laptop/10-variables.conf b/.config/sway/kd-laptop/10-variables.conf
index 4a1017e..9d726aa 120000
--- a/.config/sway/kd-laptop/10-variables.conf
+++ b/.config/sway/kd-laptop/10-variables.conf
@@ -1 +1 @@
-available/10-variables.conf
\ No newline at end of file
+../available/general/variables.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/11-base.conf b/.config/sway/kd-laptop/11-base.conf
new file mode 120000
index 0000000..1803477
--- /dev/null
+++ b/.config/sway/kd-laptop/11-base.conf
@@ -0,0 +1 @@
+../available/general/base.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/11-idle_lock.conf b/.config/sway/kd-laptop/11-idle_lock.conf
deleted file mode 100644
index cbd67df..0000000
--- a/.config/sway/kd-laptop/11-idle_lock.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# Sway Config: Idle and Lockscreen
-#
-# Thurstylark
-
-set $lock-time 900
-set $dispsleep-time 600
-
-set $dispsleep 'swaymsg "output * dpms off"'
-set $dispwake 'swaymsg "output * dpms on"'
-
-set $locker "swaylock -e -f -F -l -c 000000"
-set $unlocker "killall swaylock"
-
-exec swayidle -w \
-	timeout $lock-time $locker \
-	timeout $dispsleep-time $dispsleep \
-	resume $dispwake \
-	after-resume $dispwake \
-	before-sleep $locker \
-	lock $locker \
-	unlock $unlocker
diff --git a/.config/sway/kd-laptop/12-keybinds-base.conf b/.config/sway/kd-laptop/12-keybinds-base.conf
new file mode 120000
index 0000000..24fd810
--- /dev/null
+++ b/.config/sway/kd-laptop/12-keybinds-base.conf
@@ -0,0 +1 @@
+../available/keybinds/base.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/13-output-sane-default.conf b/.config/sway/kd-laptop/13-output-sane-default.conf
new file mode 120000
index 0000000..e27dad6
--- /dev/null
+++ b/.config/sway/kd-laptop/13-output-sane-default.conf
@@ -0,0 +1 @@
+../available/output/sane-default.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/14-output-configure.conf b/.config/sway/kd-laptop/14-output-configure.conf
new file mode 120000
index 0000000..cb40163
--- /dev/null
+++ b/.config/sway/kd-laptop/14-output-configure.conf
@@ -0,0 +1 @@
+../available/output/configure.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/15-input.conf b/.config/sway/kd-laptop/15-input.conf
new file mode 120000
index 0000000..f5b9e26
--- /dev/null
+++ b/.config/sway/kd-laptop/15-input.conf
@@ -0,0 +1 @@
+../available/input/input.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/20-bar.conf b/.config/sway/kd-laptop/20-bar.conf
deleted file mode 100644
index cb8ed01..0000000
--- a/.config/sway/kd-laptop/20-bar.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# Sway config: Bar
-#
-# Reference: `man 5 sway-bar`
-bar {
-    position bottom
-
-    status_command py3status -c ~/.config/sway/$hostname/py3status.py
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
-}
diff --git a/.config/sway/kd-laptop/50-input-tweaks.conf b/.config/sway/kd-laptop/20-input-tweaks.conf
similarity index 100%
rename from .config/sway/kd-laptop/50-input-tweaks.conf
rename to .config/sway/kd-laptop/20-input-tweaks.conf
diff --git a/.config/sway/kd-laptop/20-keybindings.conf b/.config/sway/kd-laptop/20-keybindings.conf
deleted file mode 120000
index 64aafa4..0000000
--- a/.config/sway/kd-laptop/20-keybindings.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/20-keybindings.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/21-layout.conf b/.config/sway/kd-laptop/21-layout.conf
deleted file mode 120000
index 048e365..0000000
--- a/.config/sway/kd-laptop/21-layout.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/21-layout.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/22-movement.conf b/.config/sway/kd-laptop/22-movement.conf
deleted file mode 120000
index e62d20a..0000000
--- a/.config/sway/kd-laptop/22-movement.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/22-movement.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/24-workspaces.conf b/.config/sway/kd-laptop/24-workspaces.conf
deleted file mode 120000
index 71cc678..0000000
--- a/.config/sway/kd-laptop/24-workspaces.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/24-workspaces.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/30-output-sane-default.conf b/.config/sway/kd-laptop/30-output-sane-default.conf
deleted file mode 120000
index 4736f7b..0000000
--- a/.config/sway/kd-laptop/30-output-sane-default.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/30-output-sane-default.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/31-output-configure.conf b/.config/sway/kd-laptop/31-output-configure.conf
deleted file mode 120000
index b67330d..0000000
--- a/.config/sway/kd-laptop/31-output-configure.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/31-output-configure.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/41-input.conf b/.config/sway/kd-laptop/41-input.conf
deleted file mode 120000
index 4effe98..0000000
--- a/.config/sway/kd-laptop/41-input.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/41-input.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/42-cursor-hide.conf b/.config/sway/kd-laptop/42-cursor-hide.conf
deleted file mode 120000
index 0480495..0000000
--- a/.config/sway/kd-laptop/42-cursor-hide.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/42-cursor-hide.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/99-bpytop-monitor.conf b/.config/sway/kd-laptop/99-bpytop-monitor.conf
deleted file mode 120000
index 5364a9d..0000000
--- a/.config/sway/kd-laptop/99-bpytop-monitor.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/99-bpytop-monitor.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/99-media-workspace.conf b/.config/sway/kd-laptop/99-media-workspace.conf
deleted file mode 120000
index 8ad8527..0000000
--- a/.config/sway/kd-laptop/99-media-workspace.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/99-media-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/backlight-keys.conf b/.config/sway/kd-laptop/backlight-keys.conf
new file mode 120000
index 0000000..883159d
--- /dev/null
+++ b/.config/sway/kd-laptop/backlight-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/backlight-keys.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/backlight-min.conf b/.config/sway/kd-laptop/backlight-min.conf
new file mode 120000
index 0000000..3ead22d
--- /dev/null
+++ b/.config/sway/kd-laptop/backlight-min.conf
@@ -0,0 +1 @@
+../available/output/backlight-min.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/py3status.py b/.config/sway/kd-laptop/bar/py3status.py
similarity index 100%
rename from .config/sway/kd-laptop/py3status.py
rename to .config/sway/kd-laptop/bar/py3status.py
diff --git a/.config/sway/kd-laptop/bg b/.config/sway/kd-laptop/bg
deleted file mode 120000
index a0d607b..0000000
--- a/.config/sway/kd-laptop/bg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/backgrounds/thurstylark/spacetux.jpg
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/cursor-hide.conf b/.config/sway/kd-laptop/cursor-hide.conf
new file mode 120000
index 0000000..a4eefa4
--- /dev/null
+++ b/.config/sway/kd-laptop/cursor-hide.conf
@@ -0,0 +1 @@
+../available/input/cursor-hide.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/default-bg.conf b/.config/sway/kd-laptop/default-bg.conf
new file mode 120000
index 0000000..686beb7
--- /dev/null
+++ b/.config/sway/kd-laptop/default-bg.conf
@@ -0,0 +1 @@
+../available/output/default-bg.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/focus.conf b/.config/sway/kd-laptop/focus.conf
new file mode 120000
index 0000000..9485d0c
--- /dev/null
+++ b/.config/sway/kd-laptop/focus.conf
@@ -0,0 +1 @@
+../available/keybinds/focus.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/idle-lock.conf b/.config/sway/kd-laptop/idle-lock.conf
new file mode 120000
index 0000000..fa0f039
--- /dev/null
+++ b/.config/sway/kd-laptop/idle-lock.conf
@@ -0,0 +1 @@
+../available/general/idle-lock.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/media-workspace.conf b/.config/sway/kd-laptop/media-workspace.conf
new file mode 120000
index 0000000..f3f2e65
--- /dev/null
+++ b/.config/sway/kd-laptop/media-workspace.conf
@@ -0,0 +1 @@
+../available/extras/media-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/monitor-workspace.conf b/.config/sway/kd-laptop/monitor-workspace.conf
new file mode 120000
index 0000000..3e7ad3a
--- /dev/null
+++ b/.config/sway/kd-laptop/monitor-workspace.conf
@@ -0,0 +1 @@
+../available/extras/monitor-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/movement.conf b/.config/sway/kd-laptop/movement.conf
new file mode 120000
index 0000000..78906b7
--- /dev/null
+++ b/.config/sway/kd-laptop/movement.conf
@@ -0,0 +1 @@
+../available/keybinds/movement.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/passmenu.conf b/.config/sway/kd-laptop/passmenu.conf
new file mode 120000
index 0000000..2121a4e
--- /dev/null
+++ b/.config/sway/kd-laptop/passmenu.conf
@@ -0,0 +1 @@
+../available/keybinds/passmenu.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/playerctl-media-keys.conf b/.config/sway/kd-laptop/playerctl-media-keys.conf
new file mode 120000
index 0000000..758b097
--- /dev/null
+++ b/.config/sway/kd-laptop/playerctl-media-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/playerctl-media-keys.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/pulse-media-keys.conf b/.config/sway/kd-laptop/pulse-media-keys.conf
new file mode 120000
index 0000000..64916fb
--- /dev/null
+++ b/.config/sway/kd-laptop/pulse-media-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/pulse-media-keys.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/py3status.conf b/.config/sway/kd-laptop/py3status.conf
new file mode 120000
index 0000000..de93c74
--- /dev/null
+++ b/.config/sway/kd-laptop/py3status.conf
@@ -0,0 +1 @@
+../available/bar/py3status.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/resize.conf b/.config/sway/kd-laptop/resize.conf
new file mode 120000
index 0000000..5b7c0ab
--- /dev/null
+++ b/.config/sway/kd-laptop/resize.conf
@@ -0,0 +1 @@
+../available/mode/resize.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/scratchpad.conf b/.config/sway/kd-laptop/scratchpad.conf
new file mode 120000
index 0000000..dfbc371
--- /dev/null
+++ b/.config/sway/kd-laptop/scratchpad.conf
@@ -0,0 +1 @@
+../available/keybinds/scratchpad.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/screen-lock.conf b/.config/sway/kd-laptop/screen-lock.conf
new file mode 120000
index 0000000..d61f075
--- /dev/null
+++ b/.config/sway/kd-laptop/screen-lock.conf
@@ -0,0 +1 @@
+../available/keybinds/screen-lock.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/suspend.conf b/.config/sway/kd-laptop/suspend.conf
new file mode 120000
index 0000000..5dc5ee2
--- /dev/null
+++ b/.config/sway/kd-laptop/suspend.conf
@@ -0,0 +1 @@
+../available/keybinds/suspend.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/terminal-workspace.conf b/.config/sway/kd-laptop/terminal-workspace.conf
new file mode 120000
index 0000000..9321017
--- /dev/null
+++ b/.config/sway/kd-laptop/terminal-workspace.conf
@@ -0,0 +1 @@
+../available/extras/terminal-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/kd-laptop/workspaces.conf b/.config/sway/kd-laptop/workspaces.conf
new file mode 120000
index 0000000..ec08a9f
--- /dev/null
+++ b/.config/sway/kd-laptop/workspaces.conf
@@ -0,0 +1 @@
+../available/keybinds/workspaces.conf
\ No newline at end of file