restructured dotfiles
merge