Move Diff-related classes into namespace

Change-Id: If16ddd6f7b4840cb38e6f448e17cf23c3c6ea536