Some renaming and movement of classes.