Organizing structure
Renaming classes proper names