diff --git a/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
similarity index 100%
rename from .config/bspwm/bspwmrc
rename to bspwm/.config/bspwm/bspwmrc
diff --git a/.config/picom/picom.conf b/bspwm/.config/picom/picom.conf
similarity index 100%
rename from .config/picom/picom.conf
rename to bspwm/.config/picom/picom.conf
diff --git a/.config/polybar/config b/bspwm/.config/polybar/config
similarity index 100%
rename from .config/polybar/config
rename to bspwm/.config/polybar/config
diff --git a/.config/rofi/config.rasi b/bspwm/.config/rofi/config.rasi
similarity index 100%
rename from .config/rofi/config.rasi
rename to bspwm/.config/rofi/config.rasi
diff --git a/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
similarity index 100%
rename from .config/sxhkd/sxhkdrc
rename to bspwm/.config/sxhkd/sxhkdrc
diff --git a/.config/fish/conf.d/define_aliases.fish b/fish/.config/fish/conf.d/define_aliases.fish
similarity index 100%
rename from .config/fish/conf.d/define_aliases.fish
rename to fish/.config/fish/conf.d/define_aliases.fish
diff --git a/.config/fish/conf.d/define_global_variables.fish b/fish/.config/fish/conf.d/define_global_variables.fish
similarity index 100%
rename from .config/fish/conf.d/define_global_variables.fish
rename to fish/.config/fish/conf.d/define_global_variables.fish
diff --git a/.config/fish/conf.d/fish_frozen_theme.fish b/fish/.config/fish/conf.d/fish_frozen_theme.fish
similarity index 100%
rename from .config/fish/conf.d/fish_frozen_theme.fish
rename to fish/.config/fish/conf.d/fish_frozen_theme.fish
diff --git a/.config/fish/conf.d/import_sources.fish b/fish/.config/fish/conf.d/import_sources.fish
similarity index 100%
rename from .config/fish/conf.d/import_sources.fish
rename to fish/.config/fish/conf.d/import_sources.fish
diff --git a/.config/fish/conf.d/key_binds.fish b/fish/.config/fish/conf.d/key_binds.fish
similarity index 100%
rename from .config/fish/conf.d/key_binds.fish
rename to fish/.config/fish/conf.d/key_binds.fish
diff --git a/.config/fish/config.fish b/fish/.config/fish/config.fish
similarity index 100%
rename from .config/fish/config.fish
rename to fish/.config/fish/config.fish
diff --git a/.config/fish/functions/adr.fish b/fish/.config/fish/functions/adr.fish
similarity index 100%
rename from .config/fish/functions/adr.fish
rename to fish/.config/fish/functions/adr.fish
diff --git a/.config/fish/functions/aikeys.fish b/fish/.config/fish/functions/aikeys.fish
similarity index 100%
rename from .config/fish/functions/aikeys.fish
rename to fish/.config/fish/functions/aikeys.fish
diff --git a/.config/fish/functions/commit.fish b/fish/.config/fish/functions/commit.fish
similarity index 100%
rename from .config/fish/functions/commit.fish
rename to fish/.config/fish/functions/commit.fish
diff --git a/.config/fish/functions/editcb.fish b/fish/.config/fish/functions/editcb.fish
similarity index 100%
rename from .config/fish/functions/editcb.fish
rename to fish/.config/fish/functions/editcb.fish
diff --git a/.config/fish/functions/fish_greeting.fish b/fish/.config/fish/functions/fish_greeting.fish
similarity index 100%
rename from .config/fish/functions/fish_greeting.fish
rename to fish/.config/fish/functions/fish_greeting.fish
diff --git a/.config/fish/functions/fish_mode_prompt.fish b/fish/.config/fish/functions/fish_mode_prompt.fish
similarity index 100%
rename from .config/fish/functions/fish_mode_prompt.fish
rename to fish/.config/fish/functions/fish_mode_prompt.fish
diff --git a/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
similarity index 100%
rename from .config/fish/functions/fish_prompt.fish
rename to fish/.config/fish/functions/fish_prompt.fish
diff --git a/.config/fish/functions/fish_right_prompt.fish b/fish/.config/fish/functions/fish_right_prompt.fish
similarity index 100%
rename from .config/fish/functions/fish_right_prompt.fish
rename to fish/.config/fish/functions/fish_right_prompt.fish
diff --git a/.config/fish/functions/jmpv.fish b/fish/.config/fish/functions/jmpv.fish
similarity index 100%
rename from .config/fish/functions/jmpv.fish
rename to fish/.config/fish/functions/jmpv.fish
diff --git a/.config/fish/functions/m.fish b/fish/.config/fish/functions/m.fish
similarity index 100%
rename from .config/fish/functions/m.fish
rename to fish/.config/fish/functions/m.fish
diff --git a/.config/fish/functions/sesh.fish b/fish/.config/fish/functions/sesh.fish
similarity index 100%
rename from .config/fish/functions/sesh.fish
rename to fish/.config/fish/functions/sesh.fish
diff --git a/.config/fish/functions/ssh_add.fish b/fish/.config/fish/functions/ssh_add.fish
similarity index 100%
rename from .config/fish/functions/ssh_add.fish
rename to fish/.config/fish/functions/ssh_add.fish
diff --git a/.config/fish/functions/ssh_agent_startup.fish b/fish/.config/fish/functions/ssh_agent_startup.fish
similarity index 100%
rename from .config/fish/functions/ssh_agent_startup.fish
rename to fish/.config/fish/functions/ssh_agent_startup.fish
diff --git a/.config/fish/functions/sshre.fish b/fish/.config/fish/functions/sshre.fish
similarity index 100%
rename from .config/fish/functions/sshre.fish
rename to fish/.config/fish/functions/sshre.fish
diff --git a/.config/fish/functions/temp.fish b/fish/.config/fish/functions/temp.fish
similarity index 100%
rename from .config/fish/functions/temp.fish
rename to fish/.config/fish/functions/temp.fish
diff --git a/.config/fish/functions/vm_inst.fish b/fish/.config/fish/functions/vm_inst.fish
similarity index 100%
rename from .config/fish/functions/vm_inst.fish
rename to fish/.config/fish/functions/vm_inst.fish
diff --git a/.config/fish/functions/vm_rm.fish b/fish/.config/fish/functions/vm_rm.fish
similarity index 100%
rename from .config/fish/functions/vm_rm.fish
rename to fish/.config/fish/functions/vm_rm.fish
diff --git a/.config/fish/functions/ytmpv.fish b/fish/.config/fish/functions/ytmpv.fish
similarity index 100%
rename from .config/fish/functions/ytmpv.fish
rename to fish/.config/fish/functions/ytmpv.fish
diff --git a/.config/ghostty/config b/ghostty/.config/ghostty/config
similarity index 100%
rename from .config/ghostty/config
rename to ghostty/.config/ghostty/config
diff --git a/.gitconfig b/git/.gitconfig
similarity index 100%
rename from .gitconfig
rename to git/.gitconfig
diff --git a/.config/niri/config.kdl b/niri/.config/niri/config.kdl
similarity index 100%
rename from .config/niri/config.kdl
rename to niri/.config/niri/config.kdl
diff --git a/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
similarity index 100%
rename from .config/nvim/init.lua
rename to nvim/.config/nvim/init.lua
diff --git a/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
similarity index 100%
rename from .config/nvim/lazy-lock.json
rename to nvim/.config/nvim/lazy-lock.json
diff --git a/.config/nvim/lua/core/autocmds.lua b/nvim/.config/nvim/lua/core/autocmds.lua
similarity index 100%
rename from .config/nvim/lua/core/autocmds.lua
rename to nvim/.config/nvim/lua/core/autocmds.lua
diff --git a/.config/nvim/lua/core/keymaps.lua b/nvim/.config/nvim/lua/core/keymaps.lua
similarity index 100%
rename from .config/nvim/lua/core/keymaps.lua
rename to nvim/.config/nvim/lua/core/keymaps.lua
diff --git a/.config/nvim/lua/core/options.lua b/nvim/.config/nvim/lua/core/options.lua
similarity index 100%
rename from .config/nvim/lua/core/options.lua
rename to nvim/.config/nvim/lua/core/options.lua
diff --git a/.config/nvim/lua/plugins/editor.lua b/nvim/.config/nvim/lua/plugins/editor.lua
similarity index 100%
rename from .config/nvim/lua/plugins/editor.lua
rename to nvim/.config/nvim/lua/plugins/editor.lua
diff --git a/.config/nvim/lua/plugins/lsp_completion.lua b/nvim/.config/nvim/lua/plugins/lsp_completion.lua
similarity index 100%
rename from .config/nvim/lua/plugins/lsp_completion.lua
rename to nvim/.config/nvim/lua/plugins/lsp_completion.lua
diff --git a/.config/nvim/lua/plugins/navigation.lua b/nvim/.config/nvim/lua/plugins/navigation.lua
similarity index 100%
rename from .config/nvim/lua/plugins/navigation.lua
rename to nvim/.config/nvim/lua/plugins/navigation.lua
diff --git a/.config/nvim/lua/plugins/tools.lua b/nvim/.config/nvim/lua/plugins/tools.lua
similarity index 100%
rename from .config/nvim/lua/plugins/tools.lua
rename to nvim/.config/nvim/lua/plugins/tools.lua
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua
similarity index 100%
rename from .config/nvim/lua/plugins/treesitter.lua
rename to nvim/.config/nvim/lua/plugins/treesitter.lua
diff --git a/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua
similarity index 100%
rename from .config/nvim/lua/plugins/ui.lua
rename to nvim/.config/nvim/lua/plugins/ui.lua
diff --git a/scripts/jmpv b/scripts/jmpv
deleted file mode 100755
index ae490ed..0000000
--- a/scripts/jmpv
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-wezterm start -- fish -c jmpv
diff --git a/scripts/rebar b/scripts/rebar
deleted file mode 100755
index 94a1d68..0000000
--- a/scripts/rebar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env fish
-rebar
diff --git a/scripts/redisco b/scripts/redisco
deleted file mode 100755
index 9708960..0000000
--- a/scripts/redisco
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env fish
-wezterm start -- fish -c "redisco $argv"
diff --git a/scripts/sesh b/scripts/sesh
deleted file mode 100755
index 5abdf42..0000000
--- a/scripts/sesh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env fish
-wezterm start -- fish -c "sesh $argv"
diff --git a/scripts/toglpulse b/scripts/toglpulse
deleted file mode 100755
index 82ff5d6..0000000
--- a/scripts/toglpulse
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env fish
-toglpulse
diff --git a/scripts/vban b/scripts/vban
deleted file mode 100755
index 58a27de..0000000
--- a/scripts/vban
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-wezterm start -- fish -c vban
diff --git a/scripts/ytmpv b/scripts/ytmpv
deleted file mode 100755
index 951eb45..0000000
--- a/scripts/ytmpv
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-wezterm start -- fish -c ytmpv
diff --git a/.config/starship.toml b/starship/.config/starship.toml
similarity index 100%
rename from .config/starship.toml
rename to starship/.config/starship.toml
diff --git a/swim b/swim
deleted file mode 100755
index 3204718..0000000
--- a/swim
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env -S fish --private
-
-set general_help '
-A collection of useful functions for this project.
-
-Either run a function like ./swim.fish <function> [arg [arg [...]]
-or source the file and run them as commands:
-$ source ./swim.fish
-$ lint [args]
-
-Run ./swim help <function_name> to see it\'s definition.
-'
-
-# Configuration
-
-set src_fish_files \
-    ./install_arch \
-    ./provision_linux \
-    ./sync \
-    ./upgrade_debian \
-    ./**.fish \
-    ./.**.fish
-
-# Commands
-
-function lint -d 'Lint fish scripts'
-    fish --no-execute $src_fish_files
-end
-
-function format -d 'Format fish scripts'
-    fish_indent --write $src_fish_files
-end
-
-# --- execution/help handling ---
-
-function help -a function_name -d 'Displays help for internal function'
-    if test -n "$function_name"
-        functions $function_name
-    else
-        echo $general_help
-    end
-end
-
-argparse --ignore-unknown h/help -- $argv
-
-if test -n "$_flag_h"
-    help $argv
-else if test -n "$argv"
-    $argv
-else
-    echo $general_help
-end
diff --git a/.tmux-line.conf b/tmux/.tmux-line.conf
similarity index 100%
rename from .tmux-line.conf
rename to tmux/.tmux-line.conf
diff --git a/.tmux.conf b/tmux/.tmux.conf
similarity index 100%
rename from .tmux.conf
rename to tmux/.tmux.conf
diff --git a/.wezterm.lua b/wezterm/.wezterm.lua
similarity index 100%
rename from .wezterm.lua
rename to wezterm/.wezterm.lua
diff --git a/.skhdrc b/yabai/.skhdrc
similarity index 100%
rename from .skhdrc
rename to yabai/.skhdrc
diff --git a/.yabairc b/yabai/.yabairc
similarity index 100%
rename from .yabairc
rename to yabai/.yabairc