Using pure renames to make things clearer to git... Change-Id: Icbf5f782179a5e511aee06e7a1fa494be0a5be26