diff --git a/dot_config/private_fish/conf.d/globals.fish b/dot_config/fish/conf.d/globals.fish
similarity index 100%
rename from dot_config/private_fish/conf.d/globals.fish
rename to dot_config/fish/conf.d/globals.fish
diff --git a/dot_config/private_fish/config.fish b/dot_config/fish/config.fish
similarity index 100%
rename from dot_config/private_fish/config.fish
rename to dot_config/fish/config.fish
diff --git a/dot_config/private_fish/functions/atmux.fish b/dot_config/fish/functions/atmux.fish
similarity index 100%
rename from dot_config/private_fish/functions/atmux.fish
rename to dot_config/fish/functions/atmux.fish
diff --git a/dot_config/private_fish/functions/cm.fish b/dot_config/fish/functions/cm.fish
similarity index 100%
rename from dot_config/private_fish/functions/cm.fish
rename to dot_config/fish/functions/cm.fish
diff --git a/dot_config/private_fish/functions/diff.fish b/dot_config/fish/functions/diff.fish
similarity index 100%
rename from dot_config/private_fish/functions/diff.fish
rename to dot_config/fish/functions/diff.fish
diff --git a/dot_config/private_fish/functions/g.fish b/dot_config/fish/functions/g.fish
similarity index 100%
rename from dot_config/private_fish/functions/g.fish
rename to dot_config/fish/functions/g.fish
diff --git a/dot_config/private_fish/functions/gci.fish b/dot_config/fish/functions/gci.fish
similarity index 100%
rename from dot_config/private_fish/functions/gci.fish
rename to dot_config/fish/functions/gci.fish
diff --git a/dot_config/private_fish/functions/grep.fish b/dot_config/fish/functions/grep.fish
similarity index 100%
rename from dot_config/private_fish/functions/grep.fish
rename to dot_config/fish/functions/grep.fish
diff --git a/dot_config/private_fish/functions/greset.fish b/dot_config/fish/functions/greset.fish
similarity index 100%
rename from dot_config/private_fish/functions/greset.fish
rename to dot_config/fish/functions/greset.fish
diff --git a/dot_config/private_fish/functions/groot.fish b/dot_config/fish/functions/groot.fish
similarity index 100%
rename from dot_config/private_fish/functions/groot.fish
rename to dot_config/fish/functions/groot.fish
diff --git a/dot_config/private_fish/functions/gsi.fish b/dot_config/fish/functions/gsi.fish
similarity index 100%
rename from dot_config/private_fish/functions/gsi.fish
rename to dot_config/fish/functions/gsi.fish
diff --git a/dot_config/private_fish/functions/gsl.fish b/dot_config/fish/functions/gsl.fish
similarity index 100%
rename from dot_config/private_fish/functions/gsl.fish
rename to dot_config/fish/functions/gsl.fish
diff --git a/dot_config/private_fish/functions/gss.fish b/dot_config/fish/functions/gss.fish
similarity index 100%
rename from dot_config/private_fish/functions/gss.fish
rename to dot_config/fish/functions/gss.fish
diff --git a/dot_config/private_fish/functions/gsw.fish b/dot_config/fish/functions/gsw.fish
similarity index 100%
rename from dot_config/private_fish/functions/gsw.fish
rename to dot_config/fish/functions/gsw.fish
diff --git a/dot_config/private_fish/functions/gup.fish b/dot_config/fish/functions/gup.fish
similarity index 100%
rename from dot_config/private_fish/functions/gup.fish
rename to dot_config/fish/functions/gup.fish
diff --git a/dot_config/private_fish/functions/gwta.fish b/dot_config/fish/functions/gwta.fish
similarity index 100%
rename from dot_config/private_fish/functions/gwta.fish
rename to dot_config/fish/functions/gwta.fish
diff --git a/dot_config/private_fish/functions/gwtp.fish b/dot_config/fish/functions/gwtp.fish
similarity index 100%
rename from dot_config/private_fish/functions/gwtp.fish
rename to dot_config/fish/functions/gwtp.fish
diff --git a/dot_config/private_fish/functions/k.fish b/dot_config/fish/functions/k.fish
similarity index 100%
rename from dot_config/private_fish/functions/k.fish
rename to dot_config/fish/functions/k.fish
diff --git a/dot_config/private_fish/functions/kc.fish b/dot_config/fish/functions/kc.fish
similarity index 100%
rename from dot_config/private_fish/functions/kc.fish
rename to dot_config/fish/functions/kc.fish
diff --git a/dot_config/private_fish/functions/kg.fish b/dot_config/fish/functions/kg.fish
similarity index 100%
rename from dot_config/private_fish/functions/kg.fish
rename to dot_config/fish/functions/kg.fish
diff --git a/dot_config/private_fish/functions/kshell.fish b/dot_config/fish/functions/kshell.fish
similarity index 100%
rename from dot_config/private_fish/functions/kshell.fish
rename to dot_config/fish/functions/kshell.fish
diff --git a/dot_config/private_fish/functions/ksw.fish b/dot_config/fish/functions/ksw.fish
similarity index 100%
rename from dot_config/private_fish/functions/ksw.fish
rename to dot_config/fish/functions/ksw.fish
diff --git a/dot_config/private_fish/functions/ll.fish b/dot_config/fish/functions/ll.fish
similarity index 100%
rename from dot_config/private_fish/functions/ll.fish
rename to dot_config/fish/functions/ll.fish
diff --git a/dot_config/private_fish/functions/ls.fish b/dot_config/fish/functions/ls.fish
similarity index 100%
rename from dot_config/private_fish/functions/ls.fish
rename to dot_config/fish/functions/ls.fish
diff --git a/dot_config/private_fish/functions/rgrep.fish b/dot_config/fish/functions/rgrep.fish
similarity index 100%
rename from dot_config/private_fish/functions/rgrep.fish
rename to dot_config/fish/functions/rgrep.fish
diff --git a/dot_config/private_fish/functions/s.fish b/dot_config/fish/functions/s.fish
similarity index 100%
rename from dot_config/private_fish/functions/s.fish
rename to dot_config/fish/functions/s.fish
diff --git a/dot_config/private_fish/functions/tailf.fish b/dot_config/fish/functions/tailf.fish
similarity index 100%
rename from dot_config/private_fish/functions/tailf.fish
rename to dot_config/fish/functions/tailf.fish
diff --git a/dot_config/private_fish/functions/termcompat.fish b/dot_config/fish/functions/termcompat.fish
similarity index 100%
rename from dot_config/private_fish/functions/termcompat.fish
rename to dot_config/fish/functions/termcompat.fish
diff --git a/dot_config/private_fish/functions/tig.fish b/dot_config/fish/functions/tig.fish
similarity index 100%
rename from dot_config/private_fish/functions/tig.fish
rename to dot_config/fish/functions/tig.fish
diff --git a/dot_config/private_fish/functions/tmux.fish b/dot_config/fish/functions/tmux.fish
similarity index 100%
rename from dot_config/private_fish/functions/tmux.fish
rename to dot_config/fish/functions/tmux.fish
diff --git a/dot_config/private_fish/functions/whence.fish b/dot_config/fish/functions/whence.fish
similarity index 100%
rename from dot_config/private_fish/functions/whence.fish
rename to dot_config/fish/functions/whence.fish