Cleaning up packages and introducing new classes.