Patch Set 1: (2 inline comments)

Some of these renames are probably only detected as renames since the two versions carry the same license header, right? This looks odd, but a generic diff can't see this oddity