git rm-ing old locations of stuff