Reorganized and repurpossed classes.