Move more classes into namespaces

Change-Id: If9c64fb0d6df028df5044c99d844ba99e59a53f1
Merge "Move more classes into namespaces"