Revert "Slight rework to keep classes flow the same."

This reverts commit 1ed3c67c2c63612e42ee00e6e99dce1514418919.