Organize Content Blocks
You should always organize your content in individual containers/groups. If you cluster elements into a single folder, that is how you output will render. The more folders you use, the more organized your output.
Organize Inner Content
Once your group your containers, go further by organizing your inner content into additional groups. This will result in much cleaner code.