Reorder functions into sections