File renames as separate commit

Separate commit so git can still follow across rename. This will fail TC. Since the code needs to be changed for new changes. Can't do together or git will lose tracking. Will merge, without TC. Pull down local. Fix names and post new pull to fix that.