Move some classes into namespaces

Change-Id: I39aa15e3249d4f29b94e636f184ecf8856f9c173
Merge "Move some classes into namespaces"