modularizing commit