Refactoring class section order.