Module2 modularization