Combining text and shapes into one unit

I'm busy creating a logo using a combination of text (created with the text tool) and shapes (created with the pen tool).

When I put a stroke on said logo the outlines of each shape become visible.

I would like the stoke to be applied to the logo as a whole and not to each element.

How should I combine the text and shapes so that Illustrator sees it as one shape/image/thing?

Thanks in advance