1a. Yolk within oocytes or yolk and oocytes not in discrete organs.

1b. Yolk and eggs in more or less discrete organs.