Reorganization of regression functionality