Reorg for gerritx split.
2 files changed