Move classes into sub namespace and stop using deprecated aliases

Change-Id: Ic312e3ec1005edd9150f3b1d3b67a3ddbecdd007
Merge "Move classes into sub namespace and stop using deprecated aliases"