Merge "Move a few classes around for easier ownership control"