Reorganizing methods into different classes.