Reorganize packages and classes.