Restructured COMP module.