Clean and consolidate objects

Group together objects with elements and shared values in preparation
for removal of old QS flexiglass code (QSSceneAdapter).

Test: build
Bug: 420960164
Flag: EXEMPT minor refactor. moving things
Change-Id: Iecfc64619a0066b0c9871953d32d87d2105fb9a6