Reorganizing functionality for models and controllers...