diff --git a/alacritty.toml b/alacritty/alacritty.toml
similarity index 100%
rename from alacritty.toml
rename to alacritty/alacritty.toml
diff --git a/config.fish b/fish/config.fish
similarity index 100%
rename from config.fish
rename to fish/config.fish
diff --git a/lightdm.conf b/lightdm/lightdm.conf
similarity index 100%
rename from lightdm.conf
rename to lightdm/lightdm.conf
diff --git a/themes/tokyo-night.yml b/themes/tokyo-night.yml
deleted file mode 100644
index a88fd9b..0000000
--- a/themes/tokyo-night.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Colors (Tokyo Night)
-# Source: https://github.com/zatchheems/tokyo-night-alacritty-theme
-colors:
-  # Default colors
-  primary:
-    background: '0x1a1b26'
-    foreground: '0xa9b1d6'
-
-  # Normal colors
-  normal:
-    black:   '0x32344a'
-    red:     '0xf7768e'
-    green:   '0x9ece6a'
-    yellow:  '0xe0af68'
-    blue:    '0x7aa2f7'
-    magenta: '0xad8ee6'
-    cyan:    '0x449dab'
-    white:   '0x787c99'
-
-  # Bright colors
-  bright:
-    black:   '0x444b6a'
-    red:     '0xff7a93'
-    green:   '0xb9f27c'
-    yellow:  '0xff9e64'
-    blue:    '0x7da6ff'
-    magenta: '0xbb9af7'
-    cyan:    '0x0db9d7'
-    white:   '0xacb0d0'
diff --git a/.vimrc b/vim/.vimrc
similarity index 100%
rename from .vimrc
rename to vim/.vimrc
diff --git a/.zshrc b/zsh/.zshrc
similarity index 100%
rename from .zshrc
rename to zsh/.zshrc
diff --git a/custom.zsh b/zsh/custom.zsh
similarity index 100%
rename from custom.zsh
rename to zsh/custom.zsh