Once you have completed an iteration and implements its stories, move those stories out to the relevant component that the story relates to. The scenario tests for stories ultimately are the documentation of the behaviour of the system. A year on you won't remember (and won't care) which iteration you implemented a story, you'll be searching for it by the component whose behaviour you want to understand.