The current organizational format is correct, in my opinion. The designers have it right.
The purpose of a list should be for easy reference purposes, and if there are multiple lists, their categories should prioritized based on the most macro-sized choices to be made, down to the last choice...