Reorganize so discover classes are named more clearly.
Cleanup after re-org