Moving classes around, reflecting discussion with Madan.

Change-Id: I83a08fc3f31003b6a521f3f7fe48c47b5c489bb1
11 files changed