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