Re-org classes. No code changes.