[Suggestion] Make IC2 modular