Which 2 Cell Organelles would you expect to find these substances?

Q)Consider a cell producing steroid(Cholesterol) hormones (e.g. testosterone secreting from the testis). Which 2 cell organelles would you expect to find lots of in the cell and explain why would you expect this?

My answer: Smooth Endoplasmic Reticulum & Secretory Vesicles

-Smooth Endoplasmic Reticulum is where lipids / cholesterol are synthesized as well as the detoxification of alcohols and drugs
-Secretory Vesicles which are membrane bounded by a lipid bilayer transports these proteins/hormones that buds into the cell membrane to release them into the extracellular of the cell by exocytosis.

My dilemma: Is the secretory vesicle/vesicles considered an organelle? I'm really unsure as i cannot think of any other organelles other than the SER that produces and carries/produces steroids & hormones.

Would appreciate any help, thank you!