Re-ordering classes