Modularizing started.