git-filter-repo is amazing for the second case. I've used it to split repos and rename folders multiple times.