preparing package and class structure for v4.2