Moved classes into groups
Moved classes into groups