diff --git a/.config/sway/lark-desktop/10-variables.conf b/.config/sway/lark-desktop/10-variables.conf
index 4a1017e..9d726aa 120000
--- a/.config/sway/lark-desktop/10-variables.conf
+++ b/.config/sway/lark-desktop/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/lark-desktop/11-base.conf b/.config/sway/lark-desktop/11-base.conf
new file mode 120000
index 0000000..1803477
--- /dev/null
+++ b/.config/sway/lark-desktop/11-base.conf
@@ -0,0 +1 @@
+../available/general/base.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/12-keybinds-base.conf b/.config/sway/lark-desktop/12-keybinds-base.conf
new file mode 120000
index 0000000..24fd810
--- /dev/null
+++ b/.config/sway/lark-desktop/12-keybinds-base.conf
@@ -0,0 +1 @@
+../available/keybinds/base.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/13-output-sane-default.conf b/.config/sway/lark-desktop/13-output-sane-default.conf
new file mode 120000
index 0000000..e27dad6
--- /dev/null
+++ b/.config/sway/lark-desktop/13-output-sane-default.conf
@@ -0,0 +1 @@
+../available/output/sane-default.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/14-output-configure.conf b/.config/sway/lark-desktop/14-output-configure.conf
new file mode 120000
index 0000000..cb40163
--- /dev/null
+++ b/.config/sway/lark-desktop/14-output-configure.conf
@@ -0,0 +1 @@
+../available/output/configure.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/15-input.conf b/.config/sway/lark-desktop/15-input.conf
new file mode 120000
index 0000000..f5b9e26
--- /dev/null
+++ b/.config/sway/lark-desktop/15-input.conf
@@ -0,0 +1 @@
+../available/input/input.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/20-bar.conf b/.config/sway/lark-desktop/20-bar.conf
deleted file mode 100644
index cb8ed01..0000000
--- a/.config/sway/lark-desktop/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/lark-desktop/20-keybindings.conf b/.config/sway/lark-desktop/20-keybindings.conf
deleted file mode 120000
index 64aafa4..0000000
--- a/.config/sway/lark-desktop/20-keybindings.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/20-keybindings.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/21-layout.conf b/.config/sway/lark-desktop/21-layout.conf
deleted file mode 120000
index 048e365..0000000
--- a/.config/sway/lark-desktop/21-layout.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/21-layout.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/22-movement.conf b/.config/sway/lark-desktop/22-movement.conf
deleted file mode 120000
index e62d20a..0000000
--- a/.config/sway/lark-desktop/22-movement.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/22-movement.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/24-workspaces.conf b/.config/sway/lark-desktop/24-workspaces.conf
deleted file mode 120000
index 71cc678..0000000
--- a/.config/sway/lark-desktop/24-workspaces.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/24-workspaces.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/40-output.conf b/.config/sway/lark-desktop/40-output.conf
deleted file mode 100644
index a912395..0000000
--- a/.config/sway/lark-desktop/40-output.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Sway config: Output
-#
-# Thurstylark
-
-set $omimon "Dell Inc. Dell AW3420DW 20X9D9990E2L"
-
-set $homeuw "Unknown ASUS VP348 0x0000CA5D"
-
-set $home4k "Ancor Communications Inc ASUS PB287Q 0x00005B34"
-
-
-# Sane default of 1080p60
-output * mode 1920x1080@60Hz
-
-output $homeuw mode 3440x1440@75Hz
-output $homeuw position 0 0
-
-#output $home4k mode 2560x1440@59Hz
-output $home4k mode 3840x2160@59Hz
-output $home4k position 3440 0
-#output $home4k transform 90
-output $home4k scale 1.5
-output $home4k subpixel rgb
-
-output $omimon mode 3440x1440@60Hz
-
-output * bg ~/.config/sway/$hostname/bg fill #000000
diff --git a/.config/sway/lark-desktop/41-input.conf b/.config/sway/lark-desktop/41-input.conf
deleted file mode 120000
index 4effe98..0000000
--- a/.config/sway/lark-desktop/41-input.conf
+++ /dev/null
@@ -1 +0,0 @@
-available/41-input.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/99-bpytop-monitor.conf b/.config/sway/lark-desktop/99-bpytop-monitor.conf
deleted file mode 120000
index 5364a9d..0000000
--- a/.config/sway/lark-desktop/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/lark-desktop/99-media-workspace.conf b/.config/sway/lark-desktop/99-media-workspace.conf
deleted file mode 120000
index 8ad8527..0000000
--- a/.config/sway/lark-desktop/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/lark-desktop/backlight-keys.conf b/.config/sway/lark-desktop/backlight-keys.conf
new file mode 120000
index 0000000..883159d
--- /dev/null
+++ b/.config/sway/lark-desktop/backlight-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/backlight-keys.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/backlight-min.conf b/.config/sway/lark-desktop/backlight-min.conf
new file mode 120000
index 0000000..3ead22d
--- /dev/null
+++ b/.config/sway/lark-desktop/backlight-min.conf
@@ -0,0 +1 @@
+../available/output/backlight-min.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/py3status.py b/.config/sway/lark-desktop/bar/py3status.py
similarity index 100%
rename from .config/sway/lark-desktop/py3status.py
rename to .config/sway/lark-desktop/bar/py3status.py
diff --git a/.config/sway/lark-desktop/bg b/.config/sway/lark-desktop/bg
deleted file mode 120000
index a0d607b..0000000
--- a/.config/sway/lark-desktop/bg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/backgrounds/thurstylark/spacetux.jpg
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/cursor-hide.conf b/.config/sway/lark-desktop/cursor-hide.conf
new file mode 120000
index 0000000..a4eefa4
--- /dev/null
+++ b/.config/sway/lark-desktop/cursor-hide.conf
@@ -0,0 +1 @@
+../available/input/cursor-hide.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/default-bg.conf b/.config/sway/lark-desktop/default-bg.conf
new file mode 120000
index 0000000..686beb7
--- /dev/null
+++ b/.config/sway/lark-desktop/default-bg.conf
@@ -0,0 +1 @@
+../available/output/default-bg.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/focus.conf b/.config/sway/lark-desktop/focus.conf
new file mode 120000
index 0000000..9485d0c
--- /dev/null
+++ b/.config/sway/lark-desktop/focus.conf
@@ -0,0 +1 @@
+../available/keybinds/focus.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/idle-lock.conf b/.config/sway/lark-desktop/idle-lock.conf
new file mode 120000
index 0000000..fa0f039
--- /dev/null
+++ b/.config/sway/lark-desktop/idle-lock.conf
@@ -0,0 +1 @@
+../available/general/idle-lock.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/media-workspace.conf b/.config/sway/lark-desktop/media-workspace.conf
new file mode 120000
index 0000000..f3f2e65
--- /dev/null
+++ b/.config/sway/lark-desktop/media-workspace.conf
@@ -0,0 +1 @@
+../available/extras/media-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/monitor-workspace.conf b/.config/sway/lark-desktop/monitor-workspace.conf
new file mode 120000
index 0000000..3e7ad3a
--- /dev/null
+++ b/.config/sway/lark-desktop/monitor-workspace.conf
@@ -0,0 +1 @@
+../available/extras/monitor-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/movement.conf b/.config/sway/lark-desktop/movement.conf
new file mode 120000
index 0000000..78906b7
--- /dev/null
+++ b/.config/sway/lark-desktop/movement.conf
@@ -0,0 +1 @@
+../available/keybinds/movement.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/outputs/home-4k.conf b/.config/sway/lark-desktop/outputs/home-4k.conf
new file mode 100644
index 0000000..a64a36e
--- /dev/null
+++ b/.config/sway/lark-desktop/outputs/home-4k.conf
@@ -0,0 +1,29 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+# Display ID is required
+set $o-id "Ancor Communications Inc ASUS PB287Q 0x00005B34"
+
+# Mode
+set $o-mode "3840x2160@59Hz"
+
+# Position
+set $o-pos-x "3440"
+set $o-pos-y "0"
+
+# Scale Factor
+set $o-scalefactor "1.5"
+
+# Subpixel Mode
+set $o-subpixel "rgb"
+
+
+# Do the thing
+#  (comment or remove direcives that are unnecessary to avoid errors)
+output $o-id {
+	mode $o-mode
+	position $o-pos-x $o-pos-y
+	scale $o-scalefactor
+	subpixel $o-subpixel
+}
diff --git a/.config/sway/lark-desktop/outputs/home-ultrawide.conf b/.config/sway/lark-desktop/outputs/home-ultrawide.conf
new file mode 100644
index 0000000..32cbc83
--- /dev/null
+++ b/.config/sway/lark-desktop/outputs/home-ultrawide.conf
@@ -0,0 +1,21 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+# Display ID is required
+set $o-id "Unknown ASUS VP348 0x0000CA5D"
+
+# Mode
+set $o-mode "3440x1440@75Hz"
+
+# Position
+set $o-pos-x "0"
+set $o-pos-y "0"
+
+
+# Do the thing
+#  (comment or remove direcives that are unnecessary to avoid errors)
+output $o-id {
+	mode $o-mode
+	position $o-pos-x $o-pos-y
+}
diff --git a/.config/sway/lark-desktop/outputs/omimon.conf b/.config/sway/lark-desktop/outputs/omimon.conf
new file mode 100644
index 0000000..b2dd6aa
--- /dev/null
+++ b/.config/sway/lark-desktop/outputs/omimon.conf
@@ -0,0 +1,16 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+# Display ID is required
+set $o-id "Dell Inc. Dell AW3420DW 20X9D9990E2L"
+
+# Mode
+set $o-mode "3440x1440@60Hz"
+
+
+# Do the thing
+#  (comment or remove direcives that are unnecessary to avoid errors)
+output $o-id {
+	mode $o-mode
+}
diff --git a/.config/sway/lark-desktop/passmenu.conf b/.config/sway/lark-desktop/passmenu.conf
new file mode 120000
index 0000000..2121a4e
--- /dev/null
+++ b/.config/sway/lark-desktop/passmenu.conf
@@ -0,0 +1 @@
+../available/keybinds/passmenu.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/playerctl-media-keys.conf b/.config/sway/lark-desktop/playerctl-media-keys.conf
new file mode 120000
index 0000000..758b097
--- /dev/null
+++ b/.config/sway/lark-desktop/playerctl-media-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/playerctl-media-keys.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/pulse-media-keys.conf b/.config/sway/lark-desktop/pulse-media-keys.conf
new file mode 120000
index 0000000..64916fb
--- /dev/null
+++ b/.config/sway/lark-desktop/pulse-media-keys.conf
@@ -0,0 +1 @@
+../available/keybinds/pulse-media-keys.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/py3status.conf b/.config/sway/lark-desktop/py3status.conf
new file mode 120000
index 0000000..de93c74
--- /dev/null
+++ b/.config/sway/lark-desktop/py3status.conf
@@ -0,0 +1 @@
+../available/bar/py3status.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/resize.conf b/.config/sway/lark-desktop/resize.conf
new file mode 120000
index 0000000..5b7c0ab
--- /dev/null
+++ b/.config/sway/lark-desktop/resize.conf
@@ -0,0 +1 @@
+../available/mode/resize.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/scratchpad.conf b/.config/sway/lark-desktop/scratchpad.conf
new file mode 120000
index 0000000..dfbc371
--- /dev/null
+++ b/.config/sway/lark-desktop/scratchpad.conf
@@ -0,0 +1 @@
+../available/keybinds/scratchpad.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/screen-lock.conf b/.config/sway/lark-desktop/screen-lock.conf
new file mode 120000
index 0000000..d61f075
--- /dev/null
+++ b/.config/sway/lark-desktop/screen-lock.conf
@@ -0,0 +1 @@
+../available/keybinds/screen-lock.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/suspend.conf b/.config/sway/lark-desktop/suspend.conf
new file mode 120000
index 0000000..5dc5ee2
--- /dev/null
+++ b/.config/sway/lark-desktop/suspend.conf
@@ -0,0 +1 @@
+../available/keybinds/suspend.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/terminal-workspace.conf b/.config/sway/lark-desktop/terminal-workspace.conf
new file mode 120000
index 0000000..9321017
--- /dev/null
+++ b/.config/sway/lark-desktop/terminal-workspace.conf
@@ -0,0 +1 @@
+../available/extras/terminal-workspace.conf
\ No newline at end of file
diff --git a/.config/sway/lark-desktop/workspaces.conf b/.config/sway/lark-desktop/workspaces.conf
new file mode 120000
index 0000000..ec08a9f
--- /dev/null
+++ b/.config/sway/lark-desktop/workspaces.conf
@@ -0,0 +1 @@
+../available/keybinds/workspaces.conf
\ No newline at end of file