Reorder some definitions