Restructure package of classes.