diff --git a/kfg b/kfg
index aba6df1..ee6d9ee 100644
--- a/kfg
+++ b/kfg
@@ -508,11 +508,11 @@ function p_tmux {
   # tmux
   # -----------------
   apt_install tmux
-  download_config tmux tmux.conf https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.tmux.conf
-  download_config tmux tmux.theme https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.tmux.theme
-  download_config tmux myip.sh https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/myip.sh
+  download_config tmux tmux.conf "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/tmux/tmux.conf"
+  download_config tmux tmux.theme "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/tmux/tmux.theme"
+  download_config tmux myip.sh "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/tmux/myip.sh"
   sudo chmod +x "${CONFIG_PATH}/tmux/myip.sh"
-  install_rc_download tmux https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.tmux.rc
+  install_rc_download tmux "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/tmux/tmux.rc"
   git_clone "https://github.com/tmux-plugins/tpm" "${CONFIG_PATH}/tmux/plugins/tpm"
 }
 
@@ -530,7 +530,7 @@ function p_bat {
   # -----------------
   github_install bat "sharkdp/bat"
   #install_deb_github bat "sharkdp/bat" "bat_VERSION_ARCH.deb"
-  install_rc_download bat https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.bat.rc
+  install_rc_download bat "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/bat/bat.rc"
 }
 
 function p_lsd {
@@ -539,14 +539,14 @@ function p_lsd {
   # -----------------
   github_install "lsd" "lsd-rs/lsd"
   #install_deb_github "lsd" "lsd-rs/lsd" "lsd_VERSION_ARCH.deb"
-  install_rc lsd https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.lsd.rc
-  download_config lsd "config.yaml" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.lsd.conf"
-  download_config lsd "themes/kamu.yaml" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.lsd.theme"
+  install_rc lsd "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/lsd/lsd.rc"
+  download_config lsd "config.yaml" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/lsd/config.yaml"
+  download_config lsd "themes/kamu.yaml" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/lsd/themes/kamu.yaml"
 }
 
 function p_zoxide {
   github_install "zoxide" "ajeetdsouza/zoxide"
-  install_rc_download zoxide https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.zoxide.rc
+  install_rc_download zoxide "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/zoxide/zoxide.rc"
 }
 
 function p_omp {
@@ -554,8 +554,8 @@ function p_omp {
   # Install OhMyPosh
   # -----------------
   github_install "oh-my-posh" "JanDeDobbeleer/oh-my-posh"
-  download_config "omp" "omp.json" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.omp.json"
-  install_rc_download "omp" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.omp.rc"
+  download_config "omp" "omp.json" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/omp/omp.json"
+  install_rc_download "omp" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/omp/omp.rc"
   #install_binary_github "oh-my-posh" "JanDeDobbeleer/oh-my-posh" "posh-linux-ARCH"
 }
 
@@ -581,7 +581,7 @@ function p_fzf {
     p_fzf_tab
   fi
   
-  install_rc_download fzf "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/fzf.rc"
+  install_rc_download fzf "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/fzf/fzf.rc"
   
   #download_config "fzf" "omp.json" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.omp.json"
   #install_rc "fzf" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.omp.rc"
@@ -610,7 +610,9 @@ function install {
   # -----------------
   install_rc "export KHOME=$HOME_PATH"
   install_rc "export XDG_CONFIG_HOME=$CONFIG_PATH"
-  install_rc_download "shell" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.general.rc"
+  install_rc_download "sh" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/sh/_kfg.rc"
+  install_rc_download "sh" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/sh/keybindings.rc"
+  install_rc_download "sh" "https://git.cbeck.tech/kamu/dotfiles/raw/branch/main/.config/sh/util.rc"
 
   while :
   do