Should I break up my Common App activities?

For some of my activities on the Common App, I do different multiple activities affiliated with the same organization.

For example, I do volunteering at my church, but I have both volunteered as a CCD teaching assistant during the school year, and as a leader in Vacation Bible School.

I also do theatre. In the regular drama club, I am the Student Stage Manager, but I’m also the president of our school’s chapter of the International Thespian Society.

So, for these activities, should I list them as separate activities, since I have different roles, etc. in each? Or should I list them as the same activity, since they’re both related to the church, or the drama club?

I would do separate, depending of space needed for other activities.