I used to mv the old files, but now I just rm.

Host- specific files I handle by doing if [ -f ~/.host-bashrc ]; then . ~/.host-bashrc; fi

I also use proper extensions on my files like bashrc.sh and emacs.el for automatic syntax highlighting in editors.

My shell script just goes through the current dir turning eg. bashrc.sh into a link at ~/.bashrc