Re-order classes