I like things the way they are, personally. (Granted, I'm compulsive and tend to be against change in general.) Some of the less popular ones could get just one section, perhaps, but having none of them would be chaos.
Is the current issue that mods are constantly moving threads around? Maybe recruiting more mods would be an option as well, or even a sub-mod that just has power to move threads.