Move a few classes around for easier ownership control

Bug: 128547723
Test: rebuild
Change-Id: I8f0dcf30fee44eaae60e10510620fb518cded68f
4 files changed