File reorg to allow for merging with upstream changes.