Class re-order