Refactored everything out of Internal in preparation for deletion.