Grouped similar classes together
Merge remote-tracking branch 'origin/Beta' into Beta