Move collector factory chapter to core architecture