CardFactory Keywords

So I'm thinking it might be better if we moved all of the keywords we have piled up in the last few months into their own class. Since the keywords have crept up to 5k I think it'd be easier to have them separate for Organizational reasons.
Our primary CardFactory would handle base card setup, run it through the keyword parser, then call the appropriate Factory for whatever card type we have. And all the other Factories wouldn't have to worry about parsing keywords at all. Just handling specific cards of their own type.
I was going to do this today, but if anyone is working in the CardFactory files I can wait before pulling this out.
Our primary CardFactory would handle base card setup, run it through the keyword parser, then call the appropriate Factory for whatever card type we have. And all the other Factories wouldn't have to worry about parsing keywords at all. Just handling specific cards of their own type.
I was going to do this today, but if anyone is working in the CardFactory files I can wait before pulling this out.