Revert "Switch order - generate all B anthen A"

This reverts commit 53a480b68e4010d5ee371c1c90cf5bd8ecb78d1d.