Classes are re-organized.