Fix a broken class reference

Summary: This was broken in D13374. Also rearranged a few classes.

Test Plan: arc lint

Reviewers: epriestley, Blessed Reviewers

Reviewed By: epriestley, Blessed Reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13575