Add another level of class hierarchy, descend bits from a 1layer class

Change-Id: I66d573aba6b48667d20519b9345b2d6813b31aed