Hi Jake,
I think a general 2D section with its various subsections would work great. Everything will be tidy an more easy to find. Two thumbs up!
Barb