Qur’anic arrangement does not require every verse on a topic to be placed in one surah.

Arrangement of the Qur’an and the Rhetorical Style of Surahs