Rename Folders (Git doesn't get that) and fix images