Modularizing classes