Restructure dotfiles to be simpler